Merge remote-tracking branch 'lorenz/integration_merge'

12 years ago · e0d9b8fb19
2 changed files with 2 additions and 3 deletions
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@ -105,6 +105,8 @@ exists(user_config.pri) {
				@@ -105,6 +105,8 @@ exists(user_config.pri) {
    message("----- USING CUSTOM USER QGROUNDCONTROL CONFIG FROM user_config.pri -----")
    message("Adding support for additional MAVLink messages for: " $$MAVLINK_CONF)
    message("------------------------------------------------------------------------")
+} else {
+    MAVLINK_CONF += ardupilotmega
 }
 INCLUDEPATH += $$MAVLINKPATH
 isEmpty(MAVLINK_CONF) { 
--- a/src/uas/ArduPilotMegaMAV.h
+++ b/src/uas/ArduPilotMegaMAV.h
@ -25,9 +25,6 @@ This file is part of the QGROUNDCONTROL project
				@@ -25,9 +25,6 @@ This file is part of the QGROUNDCONTROL project
 #define ARDUPILOTMEGAMAV_H

 #include "UAS.h"
-#include "ardupilotmega/mavlink_msg_mount_configure.h"
-#include "ardupilotmega/mavlink_msg_mount_control.h"
-#include "ardupilotmega/mavlink_msg_mount_status.h"
 class ArduPilotMegaMAV : public UAS
 {
    Q_OBJECT