Merge branch 'experimental' of git://github.com/pixhawk/qgroundcontrol into experimental

qgroundcontrol.pri

@@ -77,11 +77,11 @@ macx {
     ICON = $$BASEDIR/images/icons/macx.icns
 
     # Copy audio files if needed
-    QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/qgroundcontrol.app/Contents/MacOs/.
+    QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
     # Copy google earth starter file
-    QMAKE_POST_LINK += && cp -f $$BASEDIR/images/earth.html $$TARGETDIR/qgroundcontrol.app/Contents/MacOs/.
+    QMAKE_POST_LINK += && cp -f $$BASEDIR/images/earth.html $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
     # Copy model files
-    #QMAKE_POST_LINK += && cp -f $$BASEDIR/models/*.dae $$TARGETDIR/qgroundcontrol.app/Contents/MacOs/.
+    #QMAKE_POST_LINK += && cp -f $$BASEDIR/models/*.dae $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
 
     exists(/Library/Frameworks/osg.framework):exists(/Library/Frameworks/OpenThreads.framework) {
     # No check for GLUT.framework since it's a MAC default
@@ -147,12 +147,12 @@ macx {
 linux-g++ {
 
     debug {
-        #DESTDIR = $$BUILDDIR/debug
+        DESTDIR = $$TARGETDIR/debug
         CONFIG += debug
     }
 
     release {
-        #DESTDIR = $$BUILDDIR/release
+        DESTDIR = $$TARGETDIR/release
     }
 
     QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
@@ -202,15 +202,10 @@ linux-g++ {
     DEFINES += QGC_LIBFREENECT_ENABLED
     }
 
-    debug {
-        QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug
-        QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/debug
-    }
-
-    release {
-        QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release
-        QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/release
-    }
+    QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$DESTDIR
+    QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$DESTDIR
+    QMAKE_POST_LINK += && mkdir -p $$DESTDIR/images
+    QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$DESTDIR/images/Vera.ttf
 
     # osg/osgEarth dynamic casts might fail without this compiler option.
     # see http://osgearth.org/wiki/FAQ for details.
@@ -220,12 +215,12 @@ linux-g++ {
 linux-g++-64 {
 
     debug {
-        #DESTDIR = $$BUILDDIR/debug
+        DESTDIR = $$TARGETDIR/debug
         CONFIG += debug
     }
 
     release {
-        #DESTDIR = $$BUILDDIR/release
+        DESTDIR = $$TARGETDIR/release
     }
 
     QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
@@ -276,6 +271,11 @@ linux-g++-64 {
     DEFINES += QGC_LIBFREENECT_ENABLED
     }
 
+    QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$DESTDIR
+    QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$DESTDIR
+    QMAKE_POST_LINK += && mkdir -p $$DESTDIR/images
+    QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$DESTDIR/images/Vera.ttf
+
     # osg/osgEarth dynamic casts might fail without this compiler option.
     # see http://osgearth.org/wiki/FAQ for details.
     QMAKE_CXXFLAGS += -Wl,-E

src/comm/MAVLinkSimulationLink.cc

@@ -564,8 +564,8 @@ void MAVLinkSimulationLink::mainloop()
 //        uint8_t posZControl = 0;
 //        uint8_t posYawControl = 1;
 
-        uint8_t gpsLock = 2;
-        uint8_t visLock = 3;
+//        uint8_t gpsLock = 2;
+//        uint8_t visLock = 3;
         //uint8_t posLock = qMax(gpsLock, visLock);
 
         #ifdef MAVLINK_ENABLED_PIXHAWK

src/uas/PxQuadMAV.cc

@@ -41,7 +41,7 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
 {
     // Let UAS handle the default message set
     UAS::receiveMessage(link, message);
-    mavlink_message_t* msg = &message;
+//    mavlink_message_t* msg = &message;
 
     //qDebug() << "PX RECEIVED" << msg->sysid << msg->compid << msg->msgid;
 

src/ui/map3D/QOSGWidget.h

@@ -158,7 +158,7 @@ public:
         _timer.start(1000.0f/fps);
     }
 
-    virtual void paintEvent( QPaintEvent * event ) { frame(); }
+    virtual void paintEvent( QPaintEvent * event ) { Q_UNUSED(event); frame(); }
 
     void keyPressEvent( QKeyEvent* event )
     {