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

qgroundcontrol.pri

@@ -203,13 +203,13 @@ linux-g++ {
     }
 
     debug {
-        QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
-        QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/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 $$TARGETDIR/release
+        QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/release
     }
 
     # osg/osgEarth dynamic casts might fail without this compiler option.

src/uas/UAS.cc

@@ -695,7 +695,12 @@ void UAS::setLocalPositionSetpoint(float x, float y, float z, float yaw)
     mavlink_message_t msg;
     mavlink_msg_position_control_setpoint_set_pack(mavlink->getSystemId(), mavlink->getComponentId(), &msg, uasId, 0, 0, x, y, z, yaw);
     sendMessage(msg);
-#endif
+    #else
+    Q_UNUSED(x);
+    Q_UNUSED(y);
+    Q_UNUSED(z);
+    Q_UNUSED(yaw);
+    #endif
 }
 
 void UAS::setLocalPositionOffset(float x, float y, float z, float yaw)
@@ -704,6 +709,11 @@ void UAS::setLocalPositionOffset(float x, float y, float z, float yaw)
   mavlink_message_t msg;
   mavlink_msg_position_control_offset_set_pack(mavlink->getSystemId(), mavlink->getComponentId(), &msg, uasId, 0, x, y, z, yaw);
   sendMessage(msg);
+#else
+Q_UNUSED(x);
+Q_UNUSED(y);
+Q_UNUSED(z);
+Q_UNUSED(yaw);
 #endif
 }
 

src/ui/MainWindow.cc

@@ -360,11 +360,14 @@ void MainWindow::reloadStylesheet()
 
 void MainWindow::showStatusMessage(const QString& status, int timeout)
 {
+    Q_UNUSED(status);
+    Q_UNUSED(timeout);
     //statusBar->showMessage(status, timeout);
 }
 
 void MainWindow::showStatusMessage(const QString& status)
 {
+    Q_UNUSED(status);
     //statusBar->showMessage(status, 5);
 }
 

user_config.pri.dist

@@ -26,7 +26,8 @@
 # Add or remove custom message specs here. The matching mavlink headers are
 # included in the main qgroundcontrol.pro file.
 
-MAVLINK_CONF += pixhawk \
-                slugs \
-                ualberta
+MAVLINK_CONF += pixhawk
+
+# slugs \
+# ualberta