Commit e99ffb3d authored by lm's avatar lm

Fixed compile warnings

parent 58c5b220
...@@ -77,11 +77,11 @@ macx { ...@@ -77,11 +77,11 @@ macx {
ICON = $$BASEDIR/images/icons/macx.icns ICON = $$BASEDIR/images/icons/macx.icns
# Copy audio files if needed # 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 # 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 # 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) { exists(/Library/Frameworks/osg.framework):exists(/Library/Frameworks/OpenThreads.framework) {
# No check for GLUT.framework since it's a MAC default # No check for GLUT.framework since it's a MAC default
......
...@@ -564,8 +564,8 @@ void MAVLinkSimulationLink::mainloop() ...@@ -564,8 +564,8 @@ void MAVLinkSimulationLink::mainloop()
// uint8_t posZControl = 0; // uint8_t posZControl = 0;
// uint8_t posYawControl = 1; // uint8_t posYawControl = 1;
uint8_t gpsLock = 2; // uint8_t gpsLock = 2;
uint8_t visLock = 3; // uint8_t visLock = 3;
//uint8_t posLock = qMax(gpsLock, visLock); //uint8_t posLock = qMax(gpsLock, visLock);
#ifdef MAVLINK_ENABLED_PIXHAWK #ifdef MAVLINK_ENABLED_PIXHAWK
......
...@@ -41,7 +41,7 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -41,7 +41,7 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
{ {
// Let UAS handle the default message set // Let UAS handle the default message set
UAS::receiveMessage(link, message); UAS::receiveMessage(link, message);
mavlink_message_t* msg = &message; // mavlink_message_t* msg = &message;
//qDebug() << "PX RECEIVED" << msg->sysid << msg->compid << msg->msgid; //qDebug() << "PX RECEIVED" << msg->sysid << msg->compid << msg->msgid;
......
...@@ -158,7 +158,7 @@ public: ...@@ -158,7 +158,7 @@ public:
_timer.start(1000.0f/fps); _timer.start(1000.0f/fps);
} }
virtual void paintEvent( QPaintEvent * event ) { frame(); } virtual void paintEvent( QPaintEvent * event ) { Q_UNUSED(event); frame(); }
void keyPressEvent( QKeyEvent* event ) void keyPressEvent( QKeyEvent* event )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment