From 943cb967a113cba4feed8b96b31c28f4458abb84 Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Thu, 28 Feb 2019 13:49:05 -0500
Subject: [PATCH] CP - Disable APM code if it's disabled in the build.

---
 QGCExternalLibs.pri             |  1 +
 qgroundcontrol.pro              | 10 ++++++++--
 src/Settings/SettingsManager.cc |  4 ++++
 src/Settings/SettingsManager.h  |  8 ++++++--
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index 034dbfdc0..f1c8a2645 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -53,6 +53,7 @@ isEmpty(MAVLINK_CONF) {
 contains (CONFIG, QGC_DISABLE_APM_MAVLINK) {
     message("Disable APM MAVLink support")
     DEFINES += NO_ARDUPILOT_DIALECT
+    CONFIG  += ArdupilotDisabled
 }
 
 # First we select the dialect, checking for valid user selection
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 6e7900958..c7cbd88b6 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -596,7 +596,6 @@ HEADERS += \
     src/QmlControls/RCChannelMonitorController.h \
     src/QmlControls/ScreenToolsController.h \
     src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h \
-    src/Settings/APMMavlinkStreamRateSettings.h \
     src/Settings/AppSettings.h \
     src/Settings/AutoConnectSettings.h \
     src/Settings/BrandImageSettings.h \
@@ -800,7 +799,6 @@ SOURCES += \
     src/QmlControls/RCChannelMonitorController.cc \
     src/QmlControls/ScreenToolsController.cc \
     src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc \
-    src/Settings/APMMavlinkStreamRateSettings.cc \
     src/Settings/AppSettings.cc \
     src/Settings/AutoConnectSettings.cc \
     src/Settings/BrandImageSettings.cc \
@@ -965,6 +963,14 @@ SOURCES += \
 
 # ArduPilot FirmwarePlugin
 
+!ArdupilotDisabled {
+    INCLUDEPATH += \
+        src/Settings/APMMavlinkStreamRateSettings.h \
+
+    SOURCES += \
+        src/Settings/APMMavlinkStreamRateSettings.cc \
+}
+
 APMFirmwarePlugin {
     RESOURCES *= src/FirmwarePlugin/APM/APMResources.qrc
 
diff --git a/src/Settings/SettingsManager.cc b/src/Settings/SettingsManager.cc
index 70a44ecc5..8bb7bf94d 100644
--- a/src/Settings/SettingsManager.cc
+++ b/src/Settings/SettingsManager.cc
@@ -26,7 +26,9 @@ SettingsManager::SettingsManager(QGCApplication* app, QGCToolbox* toolbox)
     , _flyViewSettings              (nullptr)
     , _planViewSettings             (nullptr)
     , _brandImageSettings           (nullptr)
+#if !defined(NO_ARDUPILOT_DIALECT)
     , _apmMavlinkStreamRateSettings (nullptr)
+#endif
 {
 
 }
@@ -46,7 +48,9 @@ void SettingsManager::setToolbox(QGCToolbox *toolbox)
     _flyViewSettings =              new FlyViewSettings     (this);
     _planViewSettings =             new PlanViewSettings    (this);
     _brandImageSettings =           new BrandImageSettings  (this);
+#if !defined(NO_ARDUPILOT_DIALECT)
     _apmMavlinkStreamRateSettings = new APMMavlinkStreamRateSettings     (this);
+#endif
 #if defined(QGC_AIRMAP_ENABLED)
     _airMapSettings =               new AirMapSettings      (this);
 #endif
diff --git a/src/Settings/SettingsManager.h b/src/Settings/SettingsManager.h
index 47d63b3ef..c0dd63c4f 100644
--- a/src/Settings/SettingsManager.h
+++ b/src/Settings/SettingsManager.h
@@ -49,8 +49,9 @@ public:
     Q_PROPERTY(QObject* flyViewSettings                 READ flyViewSettings                CONSTANT)
     Q_PROPERTY(QObject* planViewSettings                READ planViewSettings               CONSTANT)
     Q_PROPERTY(QObject* brandImageSettings              READ brandImageSettings             CONSTANT)
+#if !defined(NO_ARDUPILOT_DIALECT)
     Q_PROPERTY(QObject* apmMavlinkStreamRateSettings    READ apmMavlinkStreamRateSettings   CONSTANT)
-
+#endif
     // Override from QGCTool
     virtual void setToolbox(QGCToolbox *toolbox);
 
@@ -66,8 +67,9 @@ public:
     FlyViewSettings*                flyViewSettings             (void) { return _flyViewSettings; }
     PlanViewSettings*               planViewSettings            (void) { return _planViewSettings; }
     BrandImageSettings*             brandImageSettings          (void) { return _brandImageSettings; }
+#if !defined(NO_ARDUPILOT_DIALECT)
     APMMavlinkStreamRateSettings*   apmMavlinkStreamRateSettings(void) { return _apmMavlinkStreamRateSettings; }
-
+#endif
 private:
 #if defined(QGC_AIRMAP_ENABLED)
     AirMapSettings*         _airMapSettings;
@@ -81,7 +83,9 @@ private:
     FlyViewSettings*                _flyViewSettings;
     PlanViewSettings*               _planViewSettings;
     BrandImageSettings*             _brandImageSettings;
+#if !defined(NO_ARDUPILOT_DIALECT)
     APMMavlinkStreamRateSettings*   _apmMavlinkStreamRateSettings;
+#endif
 };
 
 #endif
-- 
2.22.0