Fixed Linux compile error

jhonconal · Dec 10, 2010 · ef361d4 · ef361d4
1 parent 773517f
commit ef361d4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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);
 }