From 809f55d259ed6749e6dd0d10b389bff253d2852e Mon Sep 17 00:00:00 2001 From: pixhawk Date: Fri, 10 Dec 2010 09:48:56 +0100 Subject: [PATCH] Fixed compile errors, stabilizing master branch --- qgroundcontrol.pri | 2 +- src/uas/UAS.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index fea08b1..3d0c61e 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -140,7 +140,7 @@ macx { # osg/osgEarth dynamic casts might fail without this compiler option. # see http://osgearth.org/wiki/FAQ for details. - QMAKE_CXXFLAGS += -Wl,-E + #QMAKE_CXXFLAGS += -Wl,-E } # GNU/Linux diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 73f62b8..60f0e04 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -637,7 +637,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) for (int i=0; i radioData = new RadioCalibrationData(aileron, + QPointer radioData = new RadioCalibrationData(aileron, elevator, rudder, gyro, pitch, throttle); emit radioCalibrationReceived(radioData); delete radioData; }