From 07089db2de0ee7966cb7db53eadf36a984c4020b Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Thu, 12 Nov 2015 23:39:53 -0500 Subject: [PATCH] Ditching the subdirs template for all platforms. --- QGCApplication.pro | 698 ------------------ qgroundcontrol.pro | 689 ++++++++++++++++- ...cationPlugin.pro => QGCLocationPlugin.pri} | 8 - .../qgeoserviceproviderpluginqgc.cpp | 2 - 4 files changed, 676 insertions(+), 721 deletions(-) delete mode 100644 QGCApplication.pro rename src/QtLocationPlugin/{QGCLocationPlugin.pro => QGCLocationPlugin.pri} (82%) diff --git a/QGCApplication.pro b/QGCApplication.pro deleted file mode 100644 index 8a6093534..000000000 --- a/QGCApplication.pro +++ /dev/null @@ -1,698 +0,0 @@ -# ------------------------------------------------- -# QGroundControl - Micro Air Vehicle Groundstation -# Please see our website at -# Maintainer: -# Lorenz Meier -# (c) 2009-2014 QGroundControl Developers -# This file is part of the open groundstation project -# QGroundControl is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# QGroundControl is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with QGroundControl. If not, see . -# ------------------------------------------------- - -include(QGCCommon.pri) - -TARGET = qgroundcontrol -TEMPLATE = app - -DebugBuild { - DESTDIR = $${OUT_PWD}/debug -} else { - DESTDIR = $${OUT_PWD}/release -} - -# Load additional config flags from user_config.pri -exists(user_config.pri):infile(user_config.pri, CONFIG) { - CONFIG += $$fromfile(user_config.pri, CONFIG) - message($$sprintf("Using user-supplied additional config: '%1' specified in user_config.pri", $$fromfile(user_config.pri, CONFIG))) -} - -LinuxBuild { - CONFIG += link_pkgconfig -} - -# QGC QtLocation plugin (for ios, it's all compiled in with the rest.) - -!iOSBuild { - LIBS += -L$${LOCATION_PLUGIN_DESTDIR} - LIBS += -l$${LOCATION_PLUGIN_NAME} -} - -# Qt configuration - -CONFIG += qt \ - thread - -QT += \ - network \ - concurrent \ - gui \ - location \ - opengl \ - positioning \ - qml \ - quick \ - quickwidgets \ - sql \ - svg \ - widgets \ - xml \ - -!MobileBuild { - QT += \ - printsupport \ - serialport \ -} - -contains(DEFINES, QGC_NOTIFY_TUNES_ENABLED) { - QT += multimedia -} - -# testlib is needed even in release flavor for QSignalSpy support -QT += testlib - -# -# OS Specific settings -# - -MacBuild { - QMAKE_INFO_PLIST = Custom-Info.plist - ICON = $${BASEDIR}/resources/icons/macx.icns - OTHER_FILES += Custom-Info.plist -} - -iOSBuild { - BUNDLE.files = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/QGCLaunchScreen.xib - QMAKE_BUNDLE_DATA += BUNDLE - LIBS += -framework AVFoundation - OBJECTIVE_SOURCES += src/audio/QGCAudioWorker_iOS.mm - #-- Info.plist (need an "official" one for the App Store) - ForAppStore { - message(App Store Build) - QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOSForAppStore-Info.plist - OTHER_FILES += $${BASEDIR}/ios/iOSForAppStore-Info.plist - } else { - QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist - OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist - } - #-- TODO: Add iTunesArtwork -} - -LinuxBuild { - CONFIG += qesp_linux_udev -} - -WindowsBuild { - RC_FILE = $${BASEDIR}/qgroundcontrol.rc -} - -# -# Build-specific settings -# - -DebugBuild { -!iOSBuild { - CONFIG += console -} -} - -!MobileBuild { -# qextserialport should not be used by general QGroundControl code. Use QSerialPort instead. This is only -# here to support special case Firmware Upgrade code. -include(libs/qextserialport/src/qextserialport.pri) -} - -# -# External library configuration -# - -include(QGCExternalLibs.pri) - -# -# Main QGroundControl portion of project file -# - -RESOURCES += \ - qgroundcontrol.qrc \ - qgcresources.qrc - -DEPENDPATH += \ - . \ - plugins - -INCLUDEPATH += . - -INCLUDEPATH += \ - include/ui \ - src \ - src/audio \ - src/AutoPilotPlugins \ - src/comm \ - src/FlightDisplay \ - src/FlightMap \ - src/input \ - src/Joystick \ - src/lib/qmapcontrol \ - src/MissionEditor \ - src/MissionManager \ - src/QmlControls \ - src/uas \ - src/ui \ - src/ui/linechart \ - src/ui/map \ - src/ui/mapdisplay \ - src/ui/mission \ - src/ui/px4_configuration \ - src/ui/toolbar \ - src/ui/uas \ - src/VehicleSetup \ - src/ViewWidgets \ - -FORMS += \ - src/QGCQmlWidgetHolder.ui \ - src/ui/LogReplayLinkConfigurationWidget.ui \ - src/ui/MainWindow.ui \ - src/ui/MAVLinkSettingsWidget.ui \ - src/ui/MockLinkConfiguration.ui \ - src/ui/QGCCommConfiguration.ui \ - src/ui/QGCLinkConfiguration.ui \ - src/ui/QGCMapRCToParamDialog.ui \ - src/ui/QGCMAVLinkLogPlayer.ui \ - src/ui/QGCPluginHost.ui \ - src/ui/QGCTCPLinkConfiguration.ui \ - src/ui/QGCUDPLinkConfiguration.ui \ - src/ui/SettingsDialog.ui \ - src/ui/uas/QGCUnconnectedInfoWidget.ui \ - src/ui/uas/UASMessageView.ui \ - -!iOSBuild { -FORMS += \ - src/ui/SerialSettings.ui \ -} - -!MobileBuild { -FORMS += \ - src/ui/Linechart.ui \ - src/ui/MultiVehicleDockWidget.ui \ - src/ui/QGCDataPlot2D.ui \ - src/ui/QGCHilConfiguration.ui \ - src/ui/QGCHilFlightGearConfiguration.ui \ - src/ui/QGCHilJSBSimConfiguration.ui \ - src/ui/QGCHilXPlaneConfiguration.ui \ - src/ui/QGCMAVLinkInspector.ui \ - src/ui/QGCTabbedInfoView.ui \ - src/ui/QGCUASFileView.ui \ - src/ui/QGCUASFileViewMulti.ui \ - src/ui/uas/UASQuickView.ui \ - src/ui/uas/UASQuickViewItemSelect.ui \ - src/ui/UASInfo.ui \ -} - -HEADERS += \ - src/audio/QGCAudioWorker.h \ - src/CmdLineOptParser.h \ - src/comm/LinkConfiguration.h \ - src/comm/LinkInterface.h \ - src/comm/LinkManager.h \ - src/comm/LogReplayLink.h \ - src/comm/MAVLinkProtocol.h \ - src/comm/MockLink.h \ - src/comm/MockLinkFileServer.h \ - src/comm/MockLinkMissionItemHandler.h \ - src/comm/ProtocolInterface.h \ - src/comm/QGCMAVLink.h \ - src/comm/TCPLink.h \ - src/comm/UDPLink.h \ - src/FlightDisplay/FlightDisplayViewController.h \ - src/FlightMap/FlightMapSettings.h \ - src/GAudioOutput.h \ - src/HomePositionManager.h \ - src/Joystick/Joystick.h \ - src/Joystick/JoystickManager.h \ - src/LogCompressor.h \ - src/MG.h \ - src/MissionManager/MissionManager.h \ - src/MissionManager/MissionController.h \ - src/QGC.h \ - src/QGCApplication.h \ - src/QGCComboBox.h \ - src/QGCConfig.h \ - src/QGCDockWidget.h \ - src/QGCFileDialog.h \ - src/QGCGeo.h \ - src/QGCLoggingCategory.h \ - src/QGCMessageBox.h \ - src/QGCPalette.h \ - src/QGCQmlWidgetHolder.h \ - src/QGCQuickWidget.h \ - src/QGCTemporaryFile.h \ - src/QGCToolbox.h \ - src/QmlControls/CoordinateVector.h \ - src/QmlControls/MavlinkQmlSingleton.h \ - src/QmlControls/ParameterEditorController.h \ - src/QmlControls/ScreenToolsController.h \ - src/QmlControls/QGCQGeoCoordinate.h \ - src/QmlControls/QGroundControlQmlGlobal.h \ - src/QmlControls/QmlObjectListModel.h \ - src/SerialPortIds.h \ - src/uas/FileManager.h \ - src/uas/UAS.h \ - src/uas/UASInterface.h \ - src/uas/UASMessageHandler.h \ - src/ui/LogReplayLinkConfigurationWidget.h \ - src/ui/MainWindow.h \ - src/ui/MAVLinkDecoder.h \ - src/ui/MAVLinkSettingsWidget.h \ - src/ui/MockLinkConfiguration.h \ - src/ui/QGCCommConfiguration.h \ - src/ui/QGCLinkConfiguration.h \ - src/ui/QGCMapRCToParamDialog.h \ - src/ui/QGCMAVLinkLogPlayer.h \ - src/ui/QGCPluginHost.h \ - src/ui/QGCTCPLinkConfiguration.h \ - src/ui/QGCUDPLinkConfiguration.h \ - src/ui/SettingsDialog.h \ - src/ui/toolbar/MainToolBarController.h \ - src/ui/uas/QGCUnconnectedInfoWidget.h \ - src/ui/uas/UASMessageView.h \ - src/MissionItem.h \ - src/AutoPilotPlugins/PX4/PX4AirframeLoader.h \ - src/QmlControls/QGCImageProvider.h \ - -WindowsBuild { - PRECOMPILED_HEADER += src/stable_headers.h - HEADERS += src/stable_headers.h -} - -!iOSBuild { -HEADERS += \ - src/comm/SerialLink.h \ - src/ui/SerialConfigurationWindow.h \ -} - -!MobileBuild { -HEADERS += \ - src/comm/QGCFlightGearLink.h \ - src/comm/QGCHilLink.h \ - src/comm/QGCJSBSimLink.h \ - src/comm/QGCXPlaneLink.h \ - src/ui/HILDockWidget.h \ - src/ui/linechart/ChartPlot.h \ - src/ui/linechart/IncrementalPlot.h \ - src/ui/linechart/LinechartPlot.h \ - src/ui/linechart/Linecharts.h \ - src/ui/linechart/LinechartWidget.h \ - src/ui/linechart/Scrollbar.h \ - src/ui/linechart/ScrollZoomer.h \ - src/ui/MultiVehicleDockWidget.h \ - src/ui/QGCDataPlot2D.h \ - src/ui/QGCHilConfiguration.h \ - src/ui/QGCHilFlightGearConfiguration.h \ - src/ui/QGCHilJSBSimConfiguration.h \ - src/ui/QGCHilXPlaneConfiguration.h \ - src/ui/QGCMAVLinkInspector.h \ - src/ui/QGCTabbedInfoView.h \ - src/ui/QGCUASFileView.h \ - src/ui/QGCUASFileViewMulti.h \ - src/ui/uas/UASInfoWidget.h \ - src/ui/uas/UASQuickView.h \ - src/ui/uas/UASQuickViewGaugeItem.h \ - src/ui/uas/UASQuickViewItem.h \ - src/ui/uas/UASQuickViewItemSelect.h \ - src/ui/uas/UASQuickViewTextItem.h \ - src/VehicleSetup/JoystickConfigController.h \ - src/ViewWidgets/CustomCommandWidget.h \ - src/ViewWidgets/CustomCommandWidgetController.h \ - src/ViewWidgets/ViewWidgetController.h \ -} - -SOURCES += \ - src/audio/QGCAudioWorker.cpp \ - src/CmdLineOptParser.cc \ - src/comm/LinkConfiguration.cc \ - src/comm/LinkManager.cc \ - src/comm/LogReplayLink.cc \ - src/comm/MAVLinkProtocol.cc \ - src/comm/MockLink.cc \ - src/comm/MockLinkFileServer.cc \ - src/comm/MockLinkMissionItemHandler.cc \ - src/comm/TCPLink.cc \ - src/comm/UDPLink.cc \ - src/FlightDisplay/FlightDisplayViewController.cc \ - src/FlightMap/FlightMapSettings.cc \ - src/GAudioOutput.cc \ - src/HomePositionManager.cc \ - src/Joystick/Joystick.cc \ - src/Joystick/JoystickManager.cc \ - src/LogCompressor.cc \ - src/main.cc \ - src/MissionManager/MissionManager.cc \ - src/MissionManager/MissionController.cc \ - src/QGC.cc \ - src/QGCApplication.cc \ - src/QGCComboBox.cc \ - src/QGCDockWidget.cc \ - src/QGCFileDialog.cc \ - src/QGCLoggingCategory.cc \ - src/QGCPalette.cc \ - src/QGCQmlWidgetHolder.cpp \ - src/QGCQuickWidget.cc \ - src/QGCTemporaryFile.cc \ - src/QGCToolbox.cc \ - src/QGCGeo.cc \ - src/QmlControls/CoordinateVector.cc \ - src/QmlControls/ParameterEditorController.cc \ - src/QmlControls/ScreenToolsController.cc \ - src/QmlControls/QGCQGeoCoordinate.cc \ - src/QmlControls/QGroundControlQmlGlobal.cc \ - src/QmlControls/QmlObjectListModel.cc \ - src/uas/FileManager.cc \ - src/uas/UAS.cc \ - src/uas/UASMessageHandler.cc \ - src/ui/LogReplayLinkConfigurationWidget.cc \ - src/ui/MainWindow.cc \ - src/ui/MAVLinkDecoder.cc \ - src/ui/MAVLinkSettingsWidget.cc \ - src/ui/MockLinkConfiguration.cc \ - src/ui/QGCCommConfiguration.cc \ - src/ui/QGCLinkConfiguration.cc \ - src/ui/QGCMapRCToParamDialog.cpp \ - src/ui/QGCMAVLinkLogPlayer.cc \ - src/ui/QGCPluginHost.cc \ - src/ui/QGCTCPLinkConfiguration.cc \ - src/ui/QGCUDPLinkConfiguration.cc \ - src/ui/SettingsDialog.cc \ - src/ui/toolbar/MainToolBarController.cc \ - src/ui/uas/QGCUnconnectedInfoWidget.cc \ - src/ui/uas/UASMessageView.cc \ - src/MissionItem.cc \ - src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc \ - src/QmlControls/QGCImageProvider.cc \ - -!iOSBuild { -SOURCES += \ - src/comm/SerialLink.cc \ - src/ui/SerialConfigurationWindow.cc \ -} - -!MobileBuild { -SOURCES += \ - src/comm/QGCFlightGearLink.cc \ - src/comm/QGCJSBSimLink.cc \ - src/comm/QGCXPlaneLink.cc \ - src/ui/HILDockWidget.cc \ - src/ui/linechart/ChartPlot.cc \ - src/ui/linechart/IncrementalPlot.cc \ - src/ui/linechart/LinechartPlot.cc \ - src/ui/linechart/Linecharts.cc \ - src/ui/linechart/LinechartWidget.cc \ - src/ui/linechart/Scrollbar.cc \ - src/ui/linechart/ScrollZoomer.cc \ - src/ui/MultiVehicleDockWidget.cc \ - src/ui/QGCDataPlot2D.cc \ - src/ui/QGCHilConfiguration.cc \ - src/ui/QGCHilFlightGearConfiguration.cc \ - src/ui/QGCHilJSBSimConfiguration.cc \ - src/ui/QGCHilXPlaneConfiguration.cc \ - src/ui/QGCMAVLinkInspector.cc \ - src/ui/QGCTabbedInfoView.cpp \ - src/ui/QGCUASFileView.cc \ - src/ui/QGCUASFileViewMulti.cc \ - src/ui/uas/UASInfoWidget.cc \ - src/ui/uas/UASQuickView.cc \ - src/ui/uas/UASQuickViewGaugeItem.cc \ - src/ui/uas/UASQuickViewItem.cc \ - src/ui/uas/UASQuickViewItemSelect.cc \ - src/ui/uas/UASQuickViewTextItem.cc \ - src/VehicleSetup/JoystickConfigController.cc \ - src/ViewWidgets/CustomCommandWidget.cc \ - src/ViewWidgets/CustomCommandWidgetController.cc \ - src/ViewWidgets/ViewWidgetController.cc \ -} - -# -# Unit Test specific configuration goes here -# -# We have to special case Windows debug_and_release builds because you can't have files -# which are only in the debug variant [QTBUG-40351]. So in this case we include unit tests -# even in the release variant. If you want a Windows release build with no unit tests run -# qmake with CONFIG-=debug_and_release CONFIG+=release. -# - -DebugBuild|WindowsDebugAndRelease { - -HEADERS += src/QmlControls/QmlTestWidget.h -SOURCES += src/QmlControls/QmlTestWidget.cc - -!MobileBuild { - -INCLUDEPATH += \ - src/qgcunittest - -HEADERS += \ - src/FactSystem/FactSystemTestBase.h \ - src/FactSystem/FactSystemTestGeneric.h \ - src/FactSystem/FactSystemTestPX4.h \ - src/MissionItemTest.h \ - src/MissionManager/MissionControllerTest.h \ - src/MissionManager/MissionControllerManagerTest.h \ - src/MissionManager/MissionManagerTest.h \ - src/qgcunittest/GeoTest.h \ - src/qgcunittest/FileDialogTest.h \ - src/qgcunittest/FileManagerTest.h \ - src/qgcunittest/FlightGearTest.h \ - src/qgcunittest/LinkManagerTest.h \ - src/qgcunittest/MainWindowTest.h \ - src/qgcunittest/MavlinkLogTest.h \ - src/qgcunittest/MessageBoxTest.h \ - src/qgcunittest/MultiSignalSpy.h \ - src/qgcunittest/PX4RCCalibrationTest.h \ - src/qgcunittest/TCPLinkTest.h \ - src/qgcunittest/TCPLoopBackServer.h \ - src/qgcunittest/UnitTest.h \ - src/VehicleSetup/SetupViewTest.h \ - -SOURCES += \ - src/FactSystem/FactSystemTestBase.cc \ - src/FactSystem/FactSystemTestGeneric.cc \ - src/FactSystem/FactSystemTestPX4.cc \ - src/MissionItemTest.cc \ - src/MissionManager/MissionControllerTest.cc \ - src/MissionManager/MissionControllerManagerTest.cc \ - src/MissionManager/MissionManagerTest.cc \ - src/qgcunittest/GeoTest.cc \ - src/qgcunittest/FileDialogTest.cc \ - src/qgcunittest/FileManagerTest.cc \ - src/qgcunittest/FlightGearTest.cc \ - src/qgcunittest/LinkManagerTest.cc \ - src/qgcunittest/MainWindowTest.cc \ - src/qgcunittest/MavlinkLogTest.cc \ - src/qgcunittest/MessageBoxTest.cc \ - src/qgcunittest/MultiSignalSpy.cc \ - src/qgcunittest/PX4RCCalibrationTest.cc \ - src/qgcunittest/TCPLinkTest.cc \ - src/qgcunittest/TCPLoopBackServer.cc \ - src/qgcunittest/UnitTest.cc \ - src/VehicleSetup/SetupViewTest.cc \ -} # DebugBuild|WindowsDebugAndRelease -} # MobileBuild - -# -# Firmware Plugin Support -# - -INCLUDEPATH += \ - src/AutoPilotPlugins/PX4 \ - src/FirmwarePlugin \ - src/Vehicle \ - src/VehicleSetup \ - -HEADERS+= \ - src/AutoPilotPlugins/AutoPilotPlugin.h \ - src/AutoPilotPlugins/AutoPilotPluginManager.h \ - src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h \ - src/AutoPilotPlugins/APM/APMAirframeComponent.h \ - src/AutoPilotPlugins/APM/APMComponent.h \ - src/AutoPilotPlugins/Generic/GenericAutoPilotPlugin.h \ - src/AutoPilotPlugins/PX4/AirframeComponent.h \ - src/AutoPilotPlugins/PX4/AirframeComponentAirframes.h \ - src/AutoPilotPlugins/PX4/AirframeComponentController.h \ - src/AutoPilotPlugins/PX4/FlightModesComponent.h \ - src/AutoPilotPlugins/PX4/FlightModesComponentController.h \ - src/AutoPilotPlugins/PX4/PowerComponent.h \ - src/AutoPilotPlugins/PX4/PowerComponentController.h \ - src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h \ - src/AutoPilotPlugins/PX4/PX4Component.h \ - src/AutoPilotPlugins/PX4/RadioComponent.h \ - src/AutoPilotPlugins/PX4/RadioComponentController.h \ - src/AutoPilotPlugins/PX4/SafetyComponent.h \ - src/AutoPilotPlugins/PX4/SensorsComponent.h \ - src/AutoPilotPlugins/PX4/SensorsComponentController.h \ - src/FirmwarePlugin/FirmwarePluginManager.h \ - src/FirmwarePlugin/FirmwarePlugin.h \ - src/FirmwarePlugin/APM/APMFirmwarePlugin.h \ - src/FirmwarePlugin/APM/APMParameterMetaData.h \ - src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h \ - src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h \ - src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h \ - src/FirmwarePlugin/Generic/GenericFirmwarePlugin.h \ - src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h \ - src/FirmwarePlugin/PX4/PX4ParameterMetaData.h \ - src/Vehicle/MultiVehicleManager.h \ - src/Vehicle/Vehicle.h \ - src/VehicleSetup/VehicleComponent.h \ - -!MobileBuild { -HEADERS += \ - src/VehicleSetup/FirmwareUpgradeController.h \ - src/VehicleSetup/Bootloader.h \ - src/VehicleSetup/PX4FirmwareUpgradeThread.h \ - src/VehicleSetup/FirmwareImage.h \ - -} - -SOURCES += \ - src/AutoPilotPlugins/AutoPilotPlugin.cc \ - src/AutoPilotPlugins/AutoPilotPluginManager.cc \ - src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc \ - src/AutoPilotPlugins/APM/APMAirframeComponent.cc \ - src/AutoPilotPlugins/APM/APMComponent.cc \ - src/AutoPilotPlugins/Generic/GenericAutoPilotPlugin.cc \ - src/AutoPilotPlugins/PX4/AirframeComponent.cc \ - src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc \ - src/AutoPilotPlugins/PX4/AirframeComponentController.cc \ - src/AutoPilotPlugins/PX4/FlightModesComponent.cc \ - src/AutoPilotPlugins/PX4/FlightModesComponentController.cc \ - src/AutoPilotPlugins/PX4/PowerComponent.cc \ - src/AutoPilotPlugins/PX4/PowerComponentController.cc \ - src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc \ - src/AutoPilotPlugins/PX4/PX4Component.cc \ - src/AutoPilotPlugins/PX4/RadioComponent.cc \ - src/AutoPilotPlugins/PX4/RadioComponentController.cc \ - src/AutoPilotPlugins/PX4/SafetyComponent.cc \ - src/AutoPilotPlugins/PX4/SensorsComponent.cc \ - src/AutoPilotPlugins/PX4/SensorsComponentController.cc \ - src/FirmwarePlugin/APM/APMFirmwarePlugin.cc \ - src/FirmwarePlugin/APM/APMParameterMetaData.cc \ - src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc \ - src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc \ - src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc \ - src/FirmwarePlugin/FirmwarePluginManager.cc \ - src/FirmwarePlugin/Generic/GenericFirmwarePlugin.cc \ - src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc \ - src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc \ - src/Vehicle/MultiVehicleManager.cc \ - src/Vehicle/Vehicle.cc \ - src/VehicleSetup/VehicleComponent.cc \ - -!MobileBuild { -SOURCES += \ - src/VehicleSetup/FirmwareUpgradeController.cc \ - src/VehicleSetup/Bootloader.cc \ - src/VehicleSetup/PX4FirmwareUpgradeThread.cc \ - src/VehicleSetup/FirmwareImage.cc \ - -} - -# Fact System code - -INCLUDEPATH += \ - src/FactSystem \ - src/FactSystem/FactControls \ - -HEADERS += \ - src/FactSystem/Fact.h \ - src/FactSystem/FactMetaData.h \ - src/FactSystem/FactSystem.h \ - src/FactSystem/FactValidator.h \ - src/FactSystem/ParameterLoader.h \ - src/FactSystem/FactControls/FactPanelController.h \ - -SOURCES += \ - src/FactSystem/Fact.cc \ - src/FactSystem/FactMetaData.cc \ - src/FactSystem/FactSystem.cc \ - src/FactSystem/FactValidator.cc \ - src/FactSystem/ParameterLoader.cc \ - src/FactSystem/FactControls/FactPanelController.cc \ - -#------------------------------------------------------------------------------------- -# Video Streaming - -INCLUDEPATH += \ - src/VideoStreaming - -HEADERS += \ - src/VideoStreaming/VideoItem.h \ - src/VideoStreaming/VideoReceiver.h \ - src/VideoStreaming/VideoStreaming.h \ - src/VideoStreaming/VideoSurface.h \ - src/VideoStreaming/VideoSurface_p.h \ - -SOURCES += \ - src/VideoStreaming/VideoItem.cc \ - src/VideoStreaming/VideoReceiver.cc \ - src/VideoStreaming/VideoStreaming.cc \ - src/VideoStreaming/VideoSurface.cc \ - -contains (DEFINES, DISABLE_VIDEOSTREAMING) { - message("Skipping support for video streaming (manual override from command line)") - DEFINES -= DISABLE_VIDEOSTREAMING -# Otherwise the user can still disable this feature in the user_config.pri file. -} else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_VIDEOSTREAMING) { - message("Skipping support for video streaming (manual override from user_config.pri)") -} else { - include(src/VideoStreaming/VideoStreaming.pri) -} - -#------------------------------------------------------------------------------------- -# Android - -AndroidBuild { - include($$PWD/libs/qtandroidserialport/src/qtandroidserialport.pri) - message("Adding Serial Java Classes") - QT += androidextras - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android - OTHER_FILES += \ - $$PWD/android/AndroidManifest.xml \ - $$PWD/android/res/xml/device_filter.xml \ - $$PWD/android/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java \ - $$PWD/android/src/com/hoho/android/usbserial/driver/CommonUsbSerialDriver.java \ - $$PWD/android/src/com/hoho/android/usbserial/driver/Cp2102SerialDriver.java \ - $$PWD/android/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java \ - $$PWD/android/src/com/hoho/android/usbserial/driver/ProlificSerialDriver.java \ - $$PWD/android/src/com/hoho/android/usbserial/driver/UsbId.java \ - $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialDriver.java \ - $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialProber.java \ - $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialRuntimeException.java \ - $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java \ - $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbIoManager.java - - DISTFILES += \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat -} - -#------------------------------------------------------------------------------------- -# -# Post link configuration -# - -include(QGCSetup.pri) - -# -# Installer targets -# - -include(QGCInstaller.pri) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 03f70bcb6..95d9b3192 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -27,18 +27,681 @@ message(Qt version $$[QT_VERSION]) error("Unsupported Qt version, 5.4+ is required") } -ios { - #-- Qmake can't handle a project within a project when generating - # an Xcode project. You end up with one project for the app and - # nothing for the location plugin. - include($$PWD/src/QtLocationPlugin/QGCLocationPlugin.pro) - include($$PWD/QGCApplication.pro) +include(QGCCommon.pri) + +TARGET = qgroundcontrol +TEMPLATE = app + +DebugBuild { + DESTDIR = $${OUT_PWD}/debug } else { - #-- The rest (make files or Visual Studio projects) works. Note - # that by default, we're using make files for Mac OS too. If - # you want an Xcode project, the same above applies. - TEMPLATE = subdirs - SUBDIRS = ./src/QtLocationPlugin/QGCLocationPlugin.pro - SUBDIRS += ./QGCApplication.pro - QGCApplication.depends = QGCLocationPlugin + DESTDIR = $${OUT_PWD}/release +} + +# Load additional config flags from user_config.pri +exists(user_config.pri):infile(user_config.pri, CONFIG) { + CONFIG += $$fromfile(user_config.pri, CONFIG) + message($$sprintf("Using user-supplied additional config: '%1' specified in user_config.pri", $$fromfile(user_config.pri, CONFIG))) +} + +LinuxBuild { + CONFIG += link_pkgconfig +} + +# Qt configuration + +CONFIG += qt \ + thread + +QT += \ + network \ + concurrent \ + gui \ + location \ + opengl \ + positioning \ + qml \ + quick \ + quickwidgets \ + sql \ + svg \ + widgets \ + xml \ + +!MobileBuild { + QT += \ + printsupport \ + serialport \ +} + +contains(DEFINES, QGC_NOTIFY_TUNES_ENABLED) { + QT += multimedia +} + +# testlib is needed even in release flavor for QSignalSpy support +QT += testlib + +# +# OS Specific settings +# + +MacBuild { + QMAKE_INFO_PLIST = Custom-Info.plist + ICON = $${BASEDIR}/resources/icons/macx.icns + OTHER_FILES += Custom-Info.plist +} + +iOSBuild { + BUNDLE.files = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/QGCLaunchScreen.xib + QMAKE_BUNDLE_DATA += BUNDLE + LIBS += -framework AVFoundation + OBJECTIVE_SOURCES += src/audio/QGCAudioWorker_iOS.mm + #-- Info.plist (need an "official" one for the App Store) + ForAppStore { + message(App Store Build) + QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOSForAppStore-Info.plist + OTHER_FILES += $${BASEDIR}/ios/iOSForAppStore-Info.plist + } else { + QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist + OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist + } + #-- TODO: Add iTunesArtwork +} + +LinuxBuild { + CONFIG += qesp_linux_udev +} + +WindowsBuild { + RC_FILE = $${BASEDIR}/qgroundcontrol.rc +} + +# +# Build-specific settings +# + +DebugBuild { +!iOSBuild { + CONFIG += console +} +} + +!MobileBuild { +# qextserialport should not be used by general QGroundControl code. Use QSerialPort instead. This is only +# here to support special case Firmware Upgrade code. +include(libs/qextserialport/src/qextserialport.pri) +} + +# +# Our QtLocation "plugin" +# + +include(src/QtLocationPlugin/QGCLocationPlugin.pri) + +# +# External library configuration +# + +include(QGCExternalLibs.pri) + +# +# Main QGroundControl portion of project file +# + +RESOURCES += \ + qgroundcontrol.qrc \ + qgcresources.qrc + +DEPENDPATH += \ + . \ + plugins + +INCLUDEPATH += . + +INCLUDEPATH += \ + include/ui \ + src \ + src/audio \ + src/AutoPilotPlugins \ + src/comm \ + src/FlightDisplay \ + src/FlightMap \ + src/input \ + src/Joystick \ + src/lib/qmapcontrol \ + src/MissionEditor \ + src/MissionManager \ + src/QmlControls \ + src/uas \ + src/ui \ + src/ui/linechart \ + src/ui/map \ + src/ui/mapdisplay \ + src/ui/mission \ + src/ui/px4_configuration \ + src/ui/toolbar \ + src/ui/uas \ + src/VehicleSetup \ + src/ViewWidgets \ + +FORMS += \ + src/QGCQmlWidgetHolder.ui \ + src/ui/LogReplayLinkConfigurationWidget.ui \ + src/ui/MainWindow.ui \ + src/ui/MAVLinkSettingsWidget.ui \ + src/ui/MockLinkConfiguration.ui \ + src/ui/QGCCommConfiguration.ui \ + src/ui/QGCLinkConfiguration.ui \ + src/ui/QGCMapRCToParamDialog.ui \ + src/ui/QGCMAVLinkLogPlayer.ui \ + src/ui/QGCPluginHost.ui \ + src/ui/QGCTCPLinkConfiguration.ui \ + src/ui/QGCUDPLinkConfiguration.ui \ + src/ui/SettingsDialog.ui \ + src/ui/uas/QGCUnconnectedInfoWidget.ui \ + src/ui/uas/UASMessageView.ui \ + +!iOSBuild { +FORMS += \ + src/ui/SerialSettings.ui \ +} + +!MobileBuild { +FORMS += \ + src/ui/Linechart.ui \ + src/ui/MultiVehicleDockWidget.ui \ + src/ui/QGCDataPlot2D.ui \ + src/ui/QGCHilConfiguration.ui \ + src/ui/QGCHilFlightGearConfiguration.ui \ + src/ui/QGCHilJSBSimConfiguration.ui \ + src/ui/QGCHilXPlaneConfiguration.ui \ + src/ui/QGCMAVLinkInspector.ui \ + src/ui/QGCTabbedInfoView.ui \ + src/ui/QGCUASFileView.ui \ + src/ui/QGCUASFileViewMulti.ui \ + src/ui/uas/UASQuickView.ui \ + src/ui/uas/UASQuickViewItemSelect.ui \ + src/ui/UASInfo.ui \ +} + +HEADERS += \ + src/audio/QGCAudioWorker.h \ + src/CmdLineOptParser.h \ + src/comm/LinkConfiguration.h \ + src/comm/LinkInterface.h \ + src/comm/LinkManager.h \ + src/comm/LogReplayLink.h \ + src/comm/MAVLinkProtocol.h \ + src/comm/MockLink.h \ + src/comm/MockLinkFileServer.h \ + src/comm/MockLinkMissionItemHandler.h \ + src/comm/ProtocolInterface.h \ + src/comm/QGCMAVLink.h \ + src/comm/TCPLink.h \ + src/comm/UDPLink.h \ + src/FlightDisplay/FlightDisplayViewController.h \ + src/FlightMap/FlightMapSettings.h \ + src/GAudioOutput.h \ + src/HomePositionManager.h \ + src/Joystick/Joystick.h \ + src/Joystick/JoystickManager.h \ + src/LogCompressor.h \ + src/MG.h \ + src/MissionManager/MissionManager.h \ + src/MissionManager/MissionController.h \ + src/QGC.h \ + src/QGCApplication.h \ + src/QGCComboBox.h \ + src/QGCConfig.h \ + src/QGCDockWidget.h \ + src/QGCFileDialog.h \ + src/QGCGeo.h \ + src/QGCLoggingCategory.h \ + src/QGCMessageBox.h \ + src/QGCPalette.h \ + src/QGCQmlWidgetHolder.h \ + src/QGCQuickWidget.h \ + src/QGCTemporaryFile.h \ + src/QGCToolbox.h \ + src/QmlControls/CoordinateVector.h \ + src/QmlControls/MavlinkQmlSingleton.h \ + src/QmlControls/ParameterEditorController.h \ + src/QmlControls/ScreenToolsController.h \ + src/QmlControls/QGCQGeoCoordinate.h \ + src/QmlControls/QGroundControlQmlGlobal.h \ + src/QmlControls/QmlObjectListModel.h \ + src/SerialPortIds.h \ + src/uas/FileManager.h \ + src/uas/UAS.h \ + src/uas/UASInterface.h \ + src/uas/UASMessageHandler.h \ + src/ui/LogReplayLinkConfigurationWidget.h \ + src/ui/MainWindow.h \ + src/ui/MAVLinkDecoder.h \ + src/ui/MAVLinkSettingsWidget.h \ + src/ui/MockLinkConfiguration.h \ + src/ui/QGCCommConfiguration.h \ + src/ui/QGCLinkConfiguration.h \ + src/ui/QGCMapRCToParamDialog.h \ + src/ui/QGCMAVLinkLogPlayer.h \ + src/ui/QGCPluginHost.h \ + src/ui/QGCTCPLinkConfiguration.h \ + src/ui/QGCUDPLinkConfiguration.h \ + src/ui/SettingsDialog.h \ + src/ui/toolbar/MainToolBarController.h \ + src/ui/uas/QGCUnconnectedInfoWidget.h \ + src/ui/uas/UASMessageView.h \ + src/MissionItem.h \ + src/AutoPilotPlugins/PX4/PX4AirframeLoader.h \ + src/QmlControls/QGCImageProvider.h \ + +WindowsBuild { + PRECOMPILED_HEADER += src/stable_headers.h + HEADERS += src/stable_headers.h } + +!iOSBuild { +HEADERS += \ + src/comm/SerialLink.h \ + src/ui/SerialConfigurationWindow.h \ +} + +!MobileBuild { +HEADERS += \ + src/comm/QGCFlightGearLink.h \ + src/comm/QGCHilLink.h \ + src/comm/QGCJSBSimLink.h \ + src/comm/QGCXPlaneLink.h \ + src/ui/HILDockWidget.h \ + src/ui/linechart/ChartPlot.h \ + src/ui/linechart/IncrementalPlot.h \ + src/ui/linechart/LinechartPlot.h \ + src/ui/linechart/Linecharts.h \ + src/ui/linechart/LinechartWidget.h \ + src/ui/linechart/Scrollbar.h \ + src/ui/linechart/ScrollZoomer.h \ + src/ui/MultiVehicleDockWidget.h \ + src/ui/QGCDataPlot2D.h \ + src/ui/QGCHilConfiguration.h \ + src/ui/QGCHilFlightGearConfiguration.h \ + src/ui/QGCHilJSBSimConfiguration.h \ + src/ui/QGCHilXPlaneConfiguration.h \ + src/ui/QGCMAVLinkInspector.h \ + src/ui/QGCTabbedInfoView.h \ + src/ui/QGCUASFileView.h \ + src/ui/QGCUASFileViewMulti.h \ + src/ui/uas/UASInfoWidget.h \ + src/ui/uas/UASQuickView.h \ + src/ui/uas/UASQuickViewGaugeItem.h \ + src/ui/uas/UASQuickViewItem.h \ + src/ui/uas/UASQuickViewItemSelect.h \ + src/ui/uas/UASQuickViewTextItem.h \ + src/VehicleSetup/JoystickConfigController.h \ + src/ViewWidgets/CustomCommandWidget.h \ + src/ViewWidgets/CustomCommandWidgetController.h \ + src/ViewWidgets/ViewWidgetController.h \ +} + +SOURCES += \ + src/audio/QGCAudioWorker.cpp \ + src/CmdLineOptParser.cc \ + src/comm/LinkConfiguration.cc \ + src/comm/LinkManager.cc \ + src/comm/LogReplayLink.cc \ + src/comm/MAVLinkProtocol.cc \ + src/comm/MockLink.cc \ + src/comm/MockLinkFileServer.cc \ + src/comm/MockLinkMissionItemHandler.cc \ + src/comm/TCPLink.cc \ + src/comm/UDPLink.cc \ + src/FlightDisplay/FlightDisplayViewController.cc \ + src/FlightMap/FlightMapSettings.cc \ + src/GAudioOutput.cc \ + src/HomePositionManager.cc \ + src/Joystick/Joystick.cc \ + src/Joystick/JoystickManager.cc \ + src/LogCompressor.cc \ + src/main.cc \ + src/MissionManager/MissionManager.cc \ + src/MissionManager/MissionController.cc \ + src/QGC.cc \ + src/QGCApplication.cc \ + src/QGCComboBox.cc \ + src/QGCDockWidget.cc \ + src/QGCFileDialog.cc \ + src/QGCLoggingCategory.cc \ + src/QGCPalette.cc \ + src/QGCQmlWidgetHolder.cpp \ + src/QGCQuickWidget.cc \ + src/QGCTemporaryFile.cc \ + src/QGCToolbox.cc \ + src/QGCGeo.cc \ + src/QmlControls/CoordinateVector.cc \ + src/QmlControls/ParameterEditorController.cc \ + src/QmlControls/ScreenToolsController.cc \ + src/QmlControls/QGCQGeoCoordinate.cc \ + src/QmlControls/QGroundControlQmlGlobal.cc \ + src/QmlControls/QmlObjectListModel.cc \ + src/uas/FileManager.cc \ + src/uas/UAS.cc \ + src/uas/UASMessageHandler.cc \ + src/ui/LogReplayLinkConfigurationWidget.cc \ + src/ui/MainWindow.cc \ + src/ui/MAVLinkDecoder.cc \ + src/ui/MAVLinkSettingsWidget.cc \ + src/ui/MockLinkConfiguration.cc \ + src/ui/QGCCommConfiguration.cc \ + src/ui/QGCLinkConfiguration.cc \ + src/ui/QGCMapRCToParamDialog.cpp \ + src/ui/QGCMAVLinkLogPlayer.cc \ + src/ui/QGCPluginHost.cc \ + src/ui/QGCTCPLinkConfiguration.cc \ + src/ui/QGCUDPLinkConfiguration.cc \ + src/ui/SettingsDialog.cc \ + src/ui/toolbar/MainToolBarController.cc \ + src/ui/uas/QGCUnconnectedInfoWidget.cc \ + src/ui/uas/UASMessageView.cc \ + src/MissionItem.cc \ + src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc \ + src/QmlControls/QGCImageProvider.cc \ + +!iOSBuild { +SOURCES += \ + src/comm/SerialLink.cc \ + src/ui/SerialConfigurationWindow.cc \ +} + +!MobileBuild { +SOURCES += \ + src/comm/QGCFlightGearLink.cc \ + src/comm/QGCJSBSimLink.cc \ + src/comm/QGCXPlaneLink.cc \ + src/ui/HILDockWidget.cc \ + src/ui/linechart/ChartPlot.cc \ + src/ui/linechart/IncrementalPlot.cc \ + src/ui/linechart/LinechartPlot.cc \ + src/ui/linechart/Linecharts.cc \ + src/ui/linechart/LinechartWidget.cc \ + src/ui/linechart/Scrollbar.cc \ + src/ui/linechart/ScrollZoomer.cc \ + src/ui/MultiVehicleDockWidget.cc \ + src/ui/QGCDataPlot2D.cc \ + src/ui/QGCHilConfiguration.cc \ + src/ui/QGCHilFlightGearConfiguration.cc \ + src/ui/QGCHilJSBSimConfiguration.cc \ + src/ui/QGCHilXPlaneConfiguration.cc \ + src/ui/QGCMAVLinkInspector.cc \ + src/ui/QGCTabbedInfoView.cpp \ + src/ui/QGCUASFileView.cc \ + src/ui/QGCUASFileViewMulti.cc \ + src/ui/uas/UASInfoWidget.cc \ + src/ui/uas/UASQuickView.cc \ + src/ui/uas/UASQuickViewGaugeItem.cc \ + src/ui/uas/UASQuickViewItem.cc \ + src/ui/uas/UASQuickViewItemSelect.cc \ + src/ui/uas/UASQuickViewTextItem.cc \ + src/VehicleSetup/JoystickConfigController.cc \ + src/ViewWidgets/CustomCommandWidget.cc \ + src/ViewWidgets/CustomCommandWidgetController.cc \ + src/ViewWidgets/ViewWidgetController.cc \ +} + +# +# Unit Test specific configuration goes here +# +# We have to special case Windows debug_and_release builds because you can't have files +# which are only in the debug variant [QTBUG-40351]. So in this case we include unit tests +# even in the release variant. If you want a Windows release build with no unit tests run +# qmake with CONFIG-=debug_and_release CONFIG+=release. +# + +DebugBuild|WindowsDebugAndRelease { + +HEADERS += src/QmlControls/QmlTestWidget.h +SOURCES += src/QmlControls/QmlTestWidget.cc + +!MobileBuild { + +INCLUDEPATH += \ + src/qgcunittest + +HEADERS += \ + src/FactSystem/FactSystemTestBase.h \ + src/FactSystem/FactSystemTestGeneric.h \ + src/FactSystem/FactSystemTestPX4.h \ + src/MissionItemTest.h \ + src/MissionManager/MissionControllerTest.h \ + src/MissionManager/MissionControllerManagerTest.h \ + src/MissionManager/MissionManagerTest.h \ + src/qgcunittest/GeoTest.h \ + src/qgcunittest/FileDialogTest.h \ + src/qgcunittest/FileManagerTest.h \ + src/qgcunittest/FlightGearTest.h \ + src/qgcunittest/LinkManagerTest.h \ + src/qgcunittest/MainWindowTest.h \ + src/qgcunittest/MavlinkLogTest.h \ + src/qgcunittest/MessageBoxTest.h \ + src/qgcunittest/MultiSignalSpy.h \ + src/qgcunittest/PX4RCCalibrationTest.h \ + src/qgcunittest/TCPLinkTest.h \ + src/qgcunittest/TCPLoopBackServer.h \ + src/qgcunittest/UnitTest.h \ + src/VehicleSetup/SetupViewTest.h \ + +SOURCES += \ + src/FactSystem/FactSystemTestBase.cc \ + src/FactSystem/FactSystemTestGeneric.cc \ + src/FactSystem/FactSystemTestPX4.cc \ + src/MissionItemTest.cc \ + src/MissionManager/MissionControllerTest.cc \ + src/MissionManager/MissionControllerManagerTest.cc \ + src/MissionManager/MissionManagerTest.cc \ + src/qgcunittest/GeoTest.cc \ + src/qgcunittest/FileDialogTest.cc \ + src/qgcunittest/FileManagerTest.cc \ + src/qgcunittest/FlightGearTest.cc \ + src/qgcunittest/LinkManagerTest.cc \ + src/qgcunittest/MainWindowTest.cc \ + src/qgcunittest/MavlinkLogTest.cc \ + src/qgcunittest/MessageBoxTest.cc \ + src/qgcunittest/MultiSignalSpy.cc \ + src/qgcunittest/PX4RCCalibrationTest.cc \ + src/qgcunittest/TCPLinkTest.cc \ + src/qgcunittest/TCPLoopBackServer.cc \ + src/qgcunittest/UnitTest.cc \ + src/VehicleSetup/SetupViewTest.cc \ +} # DebugBuild|WindowsDebugAndRelease +} # MobileBuild + +# +# Firmware Plugin Support +# + +INCLUDEPATH += \ + src/AutoPilotPlugins/PX4 \ + src/FirmwarePlugin \ + src/Vehicle \ + src/VehicleSetup \ + +HEADERS+= \ + src/AutoPilotPlugins/AutoPilotPlugin.h \ + src/AutoPilotPlugins/AutoPilotPluginManager.h \ + src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h \ + src/AutoPilotPlugins/APM/APMAirframeComponent.h \ + src/AutoPilotPlugins/APM/APMComponent.h \ + src/AutoPilotPlugins/Generic/GenericAutoPilotPlugin.h \ + src/AutoPilotPlugins/PX4/AirframeComponent.h \ + src/AutoPilotPlugins/PX4/AirframeComponentAirframes.h \ + src/AutoPilotPlugins/PX4/AirframeComponentController.h \ + src/AutoPilotPlugins/PX4/FlightModesComponent.h \ + src/AutoPilotPlugins/PX4/FlightModesComponentController.h \ + src/AutoPilotPlugins/PX4/PowerComponent.h \ + src/AutoPilotPlugins/PX4/PowerComponentController.h \ + src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h \ + src/AutoPilotPlugins/PX4/PX4Component.h \ + src/AutoPilotPlugins/PX4/RadioComponent.h \ + src/AutoPilotPlugins/PX4/RadioComponentController.h \ + src/AutoPilotPlugins/PX4/SafetyComponent.h \ + src/AutoPilotPlugins/PX4/SensorsComponent.h \ + src/AutoPilotPlugins/PX4/SensorsComponentController.h \ + src/FirmwarePlugin/FirmwarePluginManager.h \ + src/FirmwarePlugin/FirmwarePlugin.h \ + src/FirmwarePlugin/APM/APMFirmwarePlugin.h \ + src/FirmwarePlugin/APM/APMParameterMetaData.h \ + src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h \ + src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h \ + src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h \ + src/FirmwarePlugin/Generic/GenericFirmwarePlugin.h \ + src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h \ + src/FirmwarePlugin/PX4/PX4ParameterMetaData.h \ + src/Vehicle/MultiVehicleManager.h \ + src/Vehicle/Vehicle.h \ + src/VehicleSetup/VehicleComponent.h \ + +!MobileBuild { +HEADERS += \ + src/VehicleSetup/FirmwareUpgradeController.h \ + src/VehicleSetup/Bootloader.h \ + src/VehicleSetup/PX4FirmwareUpgradeThread.h \ + src/VehicleSetup/FirmwareImage.h \ + +} + +SOURCES += \ + src/AutoPilotPlugins/AutoPilotPlugin.cc \ + src/AutoPilotPlugins/AutoPilotPluginManager.cc \ + src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc \ + src/AutoPilotPlugins/APM/APMAirframeComponent.cc \ + src/AutoPilotPlugins/APM/APMComponent.cc \ + src/AutoPilotPlugins/Generic/GenericAutoPilotPlugin.cc \ + src/AutoPilotPlugins/PX4/AirframeComponent.cc \ + src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc \ + src/AutoPilotPlugins/PX4/AirframeComponentController.cc \ + src/AutoPilotPlugins/PX4/FlightModesComponent.cc \ + src/AutoPilotPlugins/PX4/FlightModesComponentController.cc \ + src/AutoPilotPlugins/PX4/PowerComponent.cc \ + src/AutoPilotPlugins/PX4/PowerComponentController.cc \ + src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc \ + src/AutoPilotPlugins/PX4/PX4Component.cc \ + src/AutoPilotPlugins/PX4/RadioComponent.cc \ + src/AutoPilotPlugins/PX4/RadioComponentController.cc \ + src/AutoPilotPlugins/PX4/SafetyComponent.cc \ + src/AutoPilotPlugins/PX4/SensorsComponent.cc \ + src/AutoPilotPlugins/PX4/SensorsComponentController.cc \ + src/FirmwarePlugin/APM/APMFirmwarePlugin.cc \ + src/FirmwarePlugin/APM/APMParameterMetaData.cc \ + src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc \ + src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc \ + src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc \ + src/FirmwarePlugin/FirmwarePluginManager.cc \ + src/FirmwarePlugin/Generic/GenericFirmwarePlugin.cc \ + src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc \ + src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc \ + src/Vehicle/MultiVehicleManager.cc \ + src/Vehicle/Vehicle.cc \ + src/VehicleSetup/VehicleComponent.cc \ + +!MobileBuild { +SOURCES += \ + src/VehicleSetup/FirmwareUpgradeController.cc \ + src/VehicleSetup/Bootloader.cc \ + src/VehicleSetup/PX4FirmwareUpgradeThread.cc \ + src/VehicleSetup/FirmwareImage.cc \ + +} + +# Fact System code + +INCLUDEPATH += \ + src/FactSystem \ + src/FactSystem/FactControls \ + +HEADERS += \ + src/FactSystem/Fact.h \ + src/FactSystem/FactMetaData.h \ + src/FactSystem/FactSystem.h \ + src/FactSystem/FactValidator.h \ + src/FactSystem/ParameterLoader.h \ + src/FactSystem/FactControls/FactPanelController.h \ + +SOURCES += \ + src/FactSystem/Fact.cc \ + src/FactSystem/FactMetaData.cc \ + src/FactSystem/FactSystem.cc \ + src/FactSystem/FactValidator.cc \ + src/FactSystem/ParameterLoader.cc \ + src/FactSystem/FactControls/FactPanelController.cc \ + +#------------------------------------------------------------------------------------- +# Video Streaming + +INCLUDEPATH += \ + src/VideoStreaming + +HEADERS += \ + src/VideoStreaming/VideoItem.h \ + src/VideoStreaming/VideoReceiver.h \ + src/VideoStreaming/VideoStreaming.h \ + src/VideoStreaming/VideoSurface.h \ + src/VideoStreaming/VideoSurface_p.h \ + +SOURCES += \ + src/VideoStreaming/VideoItem.cc \ + src/VideoStreaming/VideoReceiver.cc \ + src/VideoStreaming/VideoStreaming.cc \ + src/VideoStreaming/VideoSurface.cc \ + +contains (DEFINES, DISABLE_VIDEOSTREAMING) { + message("Skipping support for video streaming (manual override from command line)") + DEFINES -= DISABLE_VIDEOSTREAMING +# Otherwise the user can still disable this feature in the user_config.pri file. +} else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_VIDEOSTREAMING) { + message("Skipping support for video streaming (manual override from user_config.pri)") +} else { + include(src/VideoStreaming/VideoStreaming.pri) +} + +#------------------------------------------------------------------------------------- +# Android + +AndroidBuild { + include($$PWD/libs/qtandroidserialport/src/qtandroidserialport.pri) + message("Adding Serial Java Classes") + QT += androidextras + ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android + OTHER_FILES += \ + $$PWD/android/AndroidManifest.xml \ + $$PWD/android/res/xml/device_filter.xml \ + $$PWD/android/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java \ + $$PWD/android/src/com/hoho/android/usbserial/driver/CommonUsbSerialDriver.java \ + $$PWD/android/src/com/hoho/android/usbserial/driver/Cp2102SerialDriver.java \ + $$PWD/android/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java \ + $$PWD/android/src/com/hoho/android/usbserial/driver/ProlificSerialDriver.java \ + $$PWD/android/src/com/hoho/android/usbserial/driver/UsbId.java \ + $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialDriver.java \ + $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialProber.java \ + $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialRuntimeException.java \ + $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java \ + $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbIoManager.java + + DISTFILES += \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradlew \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew.bat +} + +#------------------------------------------------------------------------------------- +# +# Post link configuration +# + +include(QGCSetup.pri) + +# +# Installer targets +# + +include(QGCInstaller.pri) diff --git a/src/QtLocationPlugin/QGCLocationPlugin.pro b/src/QtLocationPlugin/QGCLocationPlugin.pri similarity index 82% rename from src/QtLocationPlugin/QGCLocationPlugin.pro rename to src/QtLocationPlugin/QGCLocationPlugin.pri index f7d617d0a..d0673c45f 100644 --- a/src/QtLocationPlugin/QGCLocationPlugin.pro +++ b/src/QtLocationPlugin/QGCLocationPlugin.pri @@ -1,12 +1,4 @@ -!ios { - include($$PWD/../../QGCCommon.pri) - TEMPLATE = lib - TARGET = QGeoServiceProviderFactoryQGC - CONFIG += plugin static - PLUGIN_TYPE = geoservices -} - QT += location-private positioning-private network contains(QT_VERSION, 5.5.1) { diff --git a/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp b/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp index c47c846de..bead3e336 100644 --- a/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp +++ b/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp @@ -51,7 +51,6 @@ #include "qgeotiledmappingmanagerengineqgc.h" #include "qgeocodingmanagerengineqgc.h" -#if defined (__ios__) Q_EXTERN_C Q_DECL_EXPORT const char *qt_plugin_query_metadata(); Q_EXTERN_C Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance(); const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_QGeoServiceProviderFactoryQGC() @@ -59,7 +58,6 @@ const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_QGeoServiceProviderFa QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance, qt_plugin_query_metadata}; return plugin; } -#endif QGeoCodingManagerEngine *QGeoServiceProviderFactoryQGC::createGeocodingManagerEngine( const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const -- 2.22.0