From 90741961cce8f9a2964159735ccd6b96b0f0899d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Wed, 20 Apr 2016 13:49:17 +0200 Subject: [PATCH] gps & rtcm: exclude on MobileBuilds (Qt serialport seems not to be available on Android & iOS) --- qgroundcontrol.pro | 28 ++++++++++++++-------------- src/QGCToolbox.cc | 6 ++++++ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index fddf246..895ca89 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -261,15 +261,6 @@ HEADERS += \ src/FlightDisplay/FlightDisplayViewController.h \ src/FlightMap/FlightMapSettings.h \ src/FlightMap/Widgets/ValuesWidgetController.h \ - src/GPS/Drivers/src/gps_helper.h \ - src/GPS/Drivers/src/ubx.h \ - src/GPS/definitions.h \ - src/GPS/vehicle_gps_position.h \ - src/GPS/satellite_info.h \ - src/GPS/RTCM/RTCMMavlink.h \ - src/GPS/GPSManager.h \ - src/GPS/GPSPositionMessage.h \ - src/GPS/GPSProvider.h \ src/GAudioOutput.h \ src/HomePositionManager.h \ src/Joystick/Joystick.h \ @@ -387,6 +378,15 @@ HEADERS += \ src/ui/uas/UASQuickViewItem.h \ src/ui/uas/UASQuickViewItemSelect.h \ src/ui/uas/UASQuickViewTextItem.h \ + src/GPS/Drivers/src/gps_helper.h \ + src/GPS/Drivers/src/ubx.h \ + src/GPS/definitions.h \ + src/GPS/vehicle_gps_position.h \ + src/GPS/satellite_info.h \ + src/GPS/RTCM/RTCMMavlink.h \ + src/GPS/GPSManager.h \ + src/GPS/GPSPositionMessage.h \ + src/GPS/GPSProvider.h \ src/VehicleSetup/JoystickConfigController.h \ src/ViewWidgets/CustomCommandWidget.h \ src/ViewWidgets/CustomCommandWidgetController.h \ @@ -416,11 +416,6 @@ SOURCES += \ src/FlightDisplay/FlightDisplayViewController.cc \ src/FlightMap/FlightMapSettings.cc \ src/FlightMap/Widgets/ValuesWidgetController.cc \ - src/GPS/Drivers/src/gps_helper.cpp \ - src/GPS/Drivers/src/ubx.cpp \ - src/GPS/RTCM/RTCMMavlink.cc \ - src/GPS/GPSManager.cc \ - src/GPS/GPSProvider.cc \ src/GAudioOutput.cc \ src/HomePositionManager.cc \ src/Joystick/Joystick.cc \ @@ -526,6 +521,11 @@ SOURCES += \ src/ui/uas/UASQuickViewItem.cc \ src/ui/uas/UASQuickViewItemSelect.cc \ src/ui/uas/UASQuickViewTextItem.cc \ + src/GPS/Drivers/src/gps_helper.cpp \ + src/GPS/Drivers/src/ubx.cpp \ + src/GPS/RTCM/RTCMMavlink.cc \ + src/GPS/GPSManager.cc \ + src/GPS/GPSProvider.cc \ src/VehicleSetup/JoystickConfigController.cc \ src/ViewWidgets/CustomCommandWidget.cc \ src/ViewWidgets/CustomCommandWidgetController.cc \ diff --git a/src/QGCToolbox.cc b/src/QGCToolbox.cc index ace2e7c..33bdd31 100644 --- a/src/QGCToolbox.cc +++ b/src/QGCToolbox.cc @@ -26,7 +26,9 @@ #include "FirmwarePluginManager.h" #include "FlightMapSettings.h" #include "GAudioOutput.h" +#ifndef __mobile__ #include "GPSManager.h" +#endif /* __mobile */ #include "HomePositionManager.h" #include "JoystickManager.h" #include "LinkManager.h" @@ -60,7 +62,9 @@ QGCToolbox::QGCToolbox(QGCApplication* app) _factSystem = new FactSystem(app); _firmwarePluginManager = new FirmwarePluginManager(app); _flightMapSettings = new FlightMapSettings(app); +#ifndef __mobile__ _gpsManager = new GPSManager(app); +#endif /* __mobile */ _homePositionManager = new HomePositionManager(app); _imageProvider = new QGCImageProvider(app); _joystickManager = new JoystickManager(app); @@ -77,7 +81,9 @@ QGCToolbox::QGCToolbox(QGCApplication* app) _factSystem->setToolbox(this); _firmwarePluginManager->setToolbox(this); _flightMapSettings->setToolbox(this); +#ifndef __mobile__ _gpsManager->setToolbox(this); +#endif /* __mobile */ _homePositionManager->setToolbox(this); _imageProvider->setToolbox(this); _joystickManager->setToolbox(this);