diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index ffd5fe80554be3128e4a8695d334059b194a7d26..3d63a6f8b7f3c76f301d10c59526af5ba8d44420 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 60f0e043f9c7259b5a7e0182e54cfec2029384ab..69af7a9d1b56ef76563d197614f603b6e21837fa 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 9d149644ece5971a715abe4d5db231bca9f91bf8..df135436a1063d90d3a7d7ae9b4747a190bfd2e2 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); } diff --git a/user_config.pri.dist b/user_config.pri.dist index fa149a1d25c1d79760c9501fa6eae47896b75ca2..d42218893571c601190d9fdb9008bcdf99a00c6a 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