From 773517f52858b864e8b89003529087553205bd28 Mon Sep 17 00:00:00 2001
From: lm <pixhawk@switched.com>
Date: Fri, 10 Dec 2010 13:34:01 +0100
Subject: [PATCH 1/2] Changed user config default options to maintainer-safe
 mode

---
 user_config.pri.dist | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/user_config.pri.dist b/user_config.pri.dist
index fa149a1..d422188 100644
--- a/user_config.pri.dist
+++ b/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
 

From ef361d413f3741af562bb98329a7117faad0cee8 Mon Sep 17 00:00:00 2001
From: lm <pixhawk@switched.com>
Date: Fri, 10 Dec 2010 16:30:35 +0100
Subject: [PATCH 2/2] Fixed Linux compile error

---
 qgroundcontrol.pri   |  8 ++++----
 src/uas/UAS.cc       | 12 +++++++++++-
 src/ui/MainWindow.cc |  3 +++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index 6cee2ee..81b930d 100644
--- a/qgroundcontrol.pri
+++ b/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.
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 60f0e04..69af7a9 100644
--- a/src/uas/UAS.cc
+++ b/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
 }
 
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 9d14964..df13543 100644
--- a/src/ui/MainWindow.cc
+++ b/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);
 }