diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 81b930db40ffcb31bb33ca44aed3cd25e569bc91..3c6eecf8b257db5dd3737209b0092bc1deb860f4 100644 --- a/qgroundcontrol.pri +++ b/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 diff --git a/src/comm/MAVLinkSimulationLink.cc b/src/comm/MAVLinkSimulationLink.cc index fb171c7344691197f54db5f8a10dfbc007632ab2..4d89666210576182e1e3aa951c65a795d22c17e3 100644 --- a/src/comm/MAVLinkSimulationLink.cc +++ b/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 diff --git a/src/uas/PxQuadMAV.cc b/src/uas/PxQuadMAV.cc index c609a950514eaabf8843e7d48226a79a1cc0a5a6..ba79d860ed9f7570ca105d26c6d31b74e5c7584d 100644 --- a/src/uas/PxQuadMAV.cc +++ b/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; diff --git a/src/ui/map3D/QOSGWidget.h b/src/ui/map3D/QOSGWidget.h index 22418446625e838890f8a04f0aaa8da93f11c772..3e788e03da5d53cee3776e23bf6765cff695187f 100644 --- a/src/ui/map3D/QOSGWidget.h +++ b/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 ) {