From b9175788bed977ee8238fba54f7ea813cd943f2e Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 5 Mar 2017 12:01:10 -0800 Subject: [PATCH] Changes imports back to v5.5 level --- src/AnalyzeView/AnalyzePage.qml | 4 ++-- src/AnalyzeView/AnalyzeView.qml | 4 ++-- src/AnalyzeView/GeoTagPage.qml | 4 ++-- src/AnalyzeView/LogDownloadPage.qml | 6 +++--- src/AutoPilotPlugins/APM/APMAirframeComponent.qml | 6 +++--- .../APM/APMAirframeComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMCameraComponent.qml | 4 ++-- src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMFlightModesComponent.qml | 4 ++-- .../APM/APMFlightModesComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMLightsComponent.qml | 4 ++-- src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMNotSupported.qml | 2 +- src/AutoPilotPlugins/APM/APMPowerComponent.qml | 6 +++--- src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml | 2 +- src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml | 4 ++-- .../APM/APMSafetyComponentSummaryCopter.qml | 4 ++-- .../APM/APMSafetyComponentSummaryPlane.qml | 4 ++-- .../APM/APMSafetyComponentSummaryRover.qml | 2 +- .../APM/APMSafetyComponentSummarySub.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSensorsComponent.qml | 6 +++--- .../APM/APMSensorsComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSubFrameComponent.qml | 4 ++-- .../APM/APMSubFrameComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml | 4 ++-- src/AutoPilotPlugins/Common/ESP8266Component.qml | 6 +++--- .../Common/ESP8266ComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/Common/MixersComponent.qml | 4 ++-- src/AutoPilotPlugins/Common/MotorComponent.qml | 4 ++-- src/AutoPilotPlugins/Common/RadioComponent.qml | 4 ++-- src/AutoPilotPlugins/Common/SetupPage.qml | 4 ++-- src/AutoPilotPlugins/PX4/AirframeComponent.qml | 4 ++-- src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/PX4/CameraComponent.qml | 6 +++--- src/AutoPilotPlugins/PX4/CameraComponentSummary.qml | 4 ++-- .../PX4/FlightModesComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml | 6 +++--- src/AutoPilotPlugins/PX4/PX4FlightModes.qml | 6 +++--- src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml | 4 ++-- src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml | 4 ++-- src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml | 4 ++-- src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml | 4 ++-- src/AutoPilotPlugins/PX4/PowerComponent.qml | 6 +++--- src/AutoPilotPlugins/PX4/PowerComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/PX4/SafetyComponent.qml | 6 +++--- src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/PX4/SensorsComponent.qml | 4 ++-- src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml | 4 ++-- .../PX4/SensorsComponentSummaryFixedWing.qml | 4 ++-- src/FactSystem/FactControls/FactBitmask.qml | 4 ++-- src/FactSystem/FactControls/FactCheckBox.qml | 4 ++-- src/FactSystem/FactControls/FactComboBox.qml | 4 ++-- src/FactSystem/FactControls/FactLabel.qml | 4 ++-- src/FactSystem/FactControls/FactPanel.qml | 4 ++-- src/FactSystem/FactControls/FactTextField.qml | 4 ++-- src/FactSystem/FactControls/FactTextFieldGrid.qml | 4 ++-- src/FactSystem/FactControls/FactTextFieldRow.qml | 4 ++-- src/FactSystem/FactSystemTest.qml | 4 ++-- src/FirmwarePlugin/APM/APMSensorParams.qml | 2 +- src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml | 4 ++-- src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml | 6 +++--- src/FirmwarePlugin/NoGeoFenceEditor.qml | 4 ++-- src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml | 4 ++-- src/FlightDisplay/FlightDisplayView.qml | 10 +++++----- src/FlightDisplay/FlightDisplayViewDummy.qml | 2 +- src/FlightDisplay/FlightDisplayViewMap.qml | 8 ++++---- src/FlightDisplay/FlightDisplayViewUVC.qml | 4 ++-- src/FlightDisplay/FlightDisplayViewVideo.qml | 4 ++-- src/FlightDisplay/FlightDisplayViewWidgets.qml | 8 ++++---- src/FlightDisplay/MultiVehicleList.qml | 6 +++--- src/FlightDisplay/VirtualJoystick.qml | 2 +- src/FlightMap/FlightMap.qml | 8 ++++---- src/FlightMap/MapItems/MissionItemIndicator.qml | 4 ++-- src/FlightMap/MapItems/MissionItemIndicatorDrag.qml | 4 ++-- src/FlightMap/MapItems/MissionItemView.qml | 8 ++++---- src/FlightMap/MapItems/MissionLineView.qml | 6 +++--- src/FlightMap/MapItems/PolygonEditor.qml | 8 ++++---- src/FlightMap/MapItems/VehicleMapItem.qml | 6 +++--- src/FlightMap/MapScale.qml | 4 ++-- src/FlightMap/QGCVideoBackground.qml | 4 ++-- src/FlightMap/Widgets/CameraWidget.qml | 4 ++-- src/FlightMap/Widgets/CenterMapDropButton.qml | 8 ++++---- src/FlightMap/Widgets/CenterMapDropPanel.qml | 8 ++++---- src/FlightMap/Widgets/CompassRing.qml | 2 +- src/FlightMap/Widgets/InstrumentSwipeView.qml | 6 +++--- src/FlightMap/Widgets/MapFitFunctions.qml | 4 ++-- src/FlightMap/Widgets/QGCArtificialHorizon.qml | 2 +- src/FlightMap/Widgets/QGCAttitudeHUD.qml | 2 +- src/FlightMap/Widgets/QGCAttitudeWidget.qml | 2 +- src/FlightMap/Widgets/QGCCompassWidget.qml | 2 +- src/FlightMap/Widgets/QGCInstrumentWidget.qml | 2 +- src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml | 2 +- src/FlightMap/Widgets/QGCPitchIndicator.qml | 2 +- src/FlightMap/Widgets/ValuesWidget.qml | 4 ++-- src/FlightMap/Widgets/VehicleHealthWidget.qml | 4 ++-- src/FlightMap/Widgets/VibrationWidget.qml | 4 ++-- src/MissionEditor/FWLandingPatternEditor.qml | 6 +++--- src/MissionEditor/FWLandingPatternMapVisual.qml | 8 ++++---- src/MissionEditor/GeoFenceEditor.qml | 4 ++-- src/MissionEditor/MissionEditor.qml | 10 +++++----- src/MissionEditor/MissionItemEditor.qml | 4 ++-- src/MissionEditor/MissionItemMapVisual.qml | 8 ++++---- src/MissionEditor/MissionItemStatus.qml | 6 +++--- src/MissionEditor/MissionSettingsEditor.qml | 6 +++--- src/MissionEditor/QGCMapPolygonControls.qml | 4 ++-- src/MissionEditor/RallyPointEditorHeader.qml | 4 ++-- src/MissionEditor/RallyPointItemEditor.qml | 6 +++--- src/MissionEditor/SimpleItemEditor.qml | 6 +++--- src/MissionEditor/SimpleItemMapVisual.qml | 8 ++++---- src/MissionEditor/SurveyItemEditor.qml | 6 +++--- src/MissionEditor/SurveyMapVisual.qml | 8 ++++---- src/MultiVehicle/MultiVehicleView.qml | 6 +++--- src/QmlControls/AppMessages.qml | 4 ++-- src/QmlControls/ClickableColor.qml | 4 ++-- src/QmlControls/DropButton.qml | 4 ++-- src/QmlControls/DropPanel.qml | 4 ++-- src/QmlControls/ExclusiveGroupItem.qml | 4 ++-- src/QmlControls/FactSliderPanel.qml | 4 ++-- src/QmlControls/FlightModeDropdown.qml | 2 +- src/QmlControls/FlightModeMenu.qml | 4 ++-- src/QmlControls/GuidedBar.qml | 2 +- src/QmlControls/IndicatorButton.qml | 4 ++-- src/QmlControls/JoystickThumbPad.qml | 4 ++-- src/QmlControls/MissionCommandDialog.qml | 4 ++-- src/QmlControls/MissionItemIndexLabel.qml | 4 ++-- src/QmlControls/ModeSwitchDisplay.qml | 4 ++-- src/QmlControls/MultiRotorMotorDisplay.qml | 2 +- src/QmlControls/OfflineMapButton.qml | 4 ++-- src/QmlControls/ParameterEditor.qml | 4 ++-- src/QmlControls/ParameterEditorDialog.qml | 6 +++--- src/QmlControls/QGCButton.qml | 4 ++-- src/QmlControls/QGCCheckBox.qml | 4 ++-- src/QmlControls/QGCColoredImage.qml | 4 ++-- src/QmlControls/QGCComboBox.qml | 4 ++-- src/QmlControls/QGCFlickable.qml | 2 +- src/QmlControls/QGCFlickableHorizontalIndicator.qml | 2 +- src/QmlControls/QGCFlickableVerticalIndicator.qml | 2 +- src/QmlControls/QGCGroupBox.qml | 4 ++-- src/QmlControls/QGCLabel.qml | 4 ++-- src/QmlControls/QGCListView.qml | 2 +- src/QmlControls/QGCMapLabel.qml | 4 ++-- src/QmlControls/QGCMobileFileOpenDialog.qml | 4 ++-- src/QmlControls/QGCMobileFileSaveDialog.qml | 4 ++-- src/QmlControls/QGCMovableItem.qml | 4 ++-- src/QmlControls/QGCPipable.qml | 4 ++-- src/QmlControls/QGCRadioButton.qml | 4 ++-- src/QmlControls/QGCSlider.qml | 4 ++-- src/QmlControls/QGCTextField.qml | 6 +++--- src/QmlControls/QGCToolBarButton.qml | 4 ++-- src/QmlControls/QGCView.qml | 4 ++-- src/QmlControls/QGCViewDialog.qml | 4 ++-- src/QmlControls/QGCViewMessage.qml | 4 ++-- src/QmlControls/QGCViewPanel.qml | 4 ++-- src/QmlControls/QmlTest.qml | 4 ++-- src/QmlControls/RCChannelMonitor.qml | 4 ++-- src/QmlControls/RoundButton.qml | 4 ++-- src/QmlControls/ScreenTools.qml | 4 ++-- src/QmlControls/SliderSwitch.qml | 4 ++-- src/QmlControls/SubMenuButton.qml | 4 ++-- src/QmlControls/ToolStrip.qml | 4 ++-- src/QmlControls/VehicleRotationCal.qml | 4 ++-- src/QmlControls/VehicleSummaryRow.qml | 4 ++-- src/QtLocationPlugin/QMLControl/OfflineMap.qml | 10 +++++----- src/VehicleSetup/FirmwareUpgrade.qml | 4 ++-- src/VehicleSetup/JoystickConfig.qml | 4 ++-- src/VehicleSetup/PX4FlowSensor.qml | 4 ++-- src/VehicleSetup/SetupParameterEditor.qml | 4 ++-- src/VehicleSetup/SetupView.qml | 4 ++-- src/VehicleSetup/VehicleSummary.qml | 4 ++-- src/ViewWidgets/CustomCommandWidget.qml | 4 ++-- src/ViewWidgets/ViewWidget.qml | 4 ++-- src/test.qml | 4 ++-- src/ui/AppSettings.qml | 6 +++--- src/ui/MainWindowHybrid.qml | 4 ++-- src/ui/MainWindowInner.qml | 6 +++--- src/ui/MainWindowNative.qml | 2 +- src/ui/preferences/BluetoothSettings.qml | 4 ++-- src/ui/preferences/DebugWindow.qml | 6 +++--- src/ui/preferences/GeneralSettings.qml | 8 ++++---- src/ui/preferences/LinkSettings.qml | 4 ++-- src/ui/preferences/LogReplaySettings.qml | 4 ++-- src/ui/preferences/MavlinkSettings.qml | 4 ++-- src/ui/preferences/MockLink.qml | 2 +- src/ui/preferences/MockLinkSettings.qml | 6 +++--- src/ui/preferences/SerialSettings.qml | 4 ++-- src/ui/preferences/TcpSettings.qml | 4 ++-- src/ui/preferences/UdpSettings.qml | 4 ++-- src/ui/toolbar/BatteryIndicator.qml | 6 +++--- src/ui/toolbar/GPSIndicator.qml | 6 +++--- src/ui/toolbar/MainToolBar.qml | 6 +++--- src/ui/toolbar/MainToolBarIndicators.qml | 6 +++--- src/ui/toolbar/MessageIndicator.qml | 6 +++--- src/ui/toolbar/ModeIndicator.qml | 4 ++-- src/ui/toolbar/RCRSSIIndicator.qml | 6 +++--- src/ui/toolbar/SignalStrength.qml | 2 +- src/ui/toolbar/TelemetryRSSIIndicator.qml | 6 +++--- 201 files changed, 446 insertions(+), 446 deletions(-) diff --git a/src/AnalyzeView/AnalyzePage.qml b/src/AnalyzeView/AnalyzePage.qml index c7e2e09247..79699a44dc 100644 --- a/src/AnalyzeView/AnalyzePage.qml +++ b/src/AnalyzeView/AnalyzePage.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AnalyzeView/AnalyzeView.qml b/src/AnalyzeView/AnalyzeView.qml index 89fb527ae3..cd910754a9 100644 --- a/src/AnalyzeView/AnalyzeView.qml +++ b/src/AnalyzeView/AnalyzeView.qml @@ -12,8 +12,8 @@ /// @brief Setup View /// @author Don Gagne -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AnalyzeView/GeoTagPage.qml b/src/AnalyzeView/GeoTagPage.qml index 625c94fcd0..7b0102dde8 100644 --- a/src/AnalyzeView/GeoTagPage.qml +++ b/src/AnalyzeView/GeoTagPage.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AnalyzeView/LogDownloadPage.qml b/src/AnalyzeView/LogDownloadPage.qml index 79c263e86b..98917c2d31 100644 --- a/src/AnalyzeView/LogDownloadPage.qml +++ b/src/AnalyzeView/LogDownloadPage.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml index bb0f4b8269..b8324bcc97 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml index b962a8befc..4f9f447ed8 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMCameraComponent.qml b/src/AutoPilotPlugins/APM/APMCameraComponent.qml index 2df39dbfb0..bd9308ff36 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponent.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml b/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml index d24ddb2933..c97de7af0c 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml b/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml index a105c5e044..5505473f3a 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml b/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml index f61a170305..fe6cb2bcd7 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMLightsComponent.qml b/src/AutoPilotPlugins/APM/APMLightsComponent.qml index 7be9951584..8e16b04e4b 100644 --- a/src/AutoPilotPlugins/APM/APMLightsComponent.qml +++ b/src/AutoPilotPlugins/APM/APMLightsComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml b/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml index a96c4f4d4e..2f06d3b276 100644 --- a/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMNotSupported.qml b/src/AutoPilotPlugins/APM/APMNotSupported.qml index 7207f3cc26..c89bd61b31 100644 --- a/src/AutoPilotPlugins/APM/APMNotSupported.qml +++ b/src/AutoPilotPlugins/APM/APMNotSupported.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.qml b/src/AutoPilotPlugins/APM/APMPowerComponent.qml index 361b349cb8..e14305f2db 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml index fa0c34f456..373d6ffa7d 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml b/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml index 2fe3b105a1..5433dc9971 100644 --- a/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml index a1ec061a56..24f5c0752a 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml index 7055357886..7006039147 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml index 7207f3cc26..c89bd61b31 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml index 6a3b25d80f..b9b7411274 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml index 12c8ceaf3a..785147b391 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml index f3da5bc02a..10f0638464 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml index 7207f3cc26..c89bd61b31 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml index fd81d910a2..20b318c825 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml index 536311d3b5..e465e08bd8 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml index 2f616eb43d..bd209e9522 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml index 26375d6524..d5d2e35395 100644 --- a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml +++ b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml b/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml index 041c728808..9403b3eb0e 100644 --- a/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml index 314a4fa2bf..64faea8acc 100644 --- a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/Common/ESP8266Component.qml b/src/AutoPilotPlugins/Common/ESP8266Component.qml index 90fc2d6018..fb5324ed8f 100644 --- a/src/AutoPilotPlugins/Common/ESP8266Component.qml +++ b/src/AutoPilotPlugins/Common/ESP8266Component.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml index db6b7588b8..57f60c4dcd 100644 --- a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml +++ b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/Common/MixersComponent.qml b/src/AutoPilotPlugins/Common/MixersComponent.qml index 9dcea5dec8..e628ba5bec 100644 --- a/src/AutoPilotPlugins/Common/MixersComponent.qml +++ b/src/AutoPilotPlugins/Common/MixersComponent.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/Common/MotorComponent.qml b/src/AutoPilotPlugins/Common/MotorComponent.qml index b2e9a29a2f..dc36a82987 100644 --- a/src/AutoPilotPlugins/Common/MotorComponent.qml +++ b/src/AutoPilotPlugins/Common/MotorComponent.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/Common/RadioComponent.qml b/src/AutoPilotPlugins/Common/RadioComponent.qml index 5c9b522ab1..3d08aa1b47 100644 --- a/src/AutoPilotPlugins/Common/RadioComponent.qml +++ b/src/AutoPilotPlugins/Common/RadioComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/Common/SetupPage.qml b/src/AutoPilotPlugins/Common/SetupPage.qml index 3a46d80a37..a781de9909 100644 --- a/src/AutoPilotPlugins/Common/SetupPage.qml +++ b/src/AutoPilotPlugins/Common/SetupPage.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.qml b/src/AutoPilotPlugins/PX4/AirframeComponent.qml index 6dd546a34f..a0920cf22a 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml index cb298cbf47..5dd0f980ca 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/CameraComponent.qml b/src/AutoPilotPlugins/PX4/CameraComponent.qml index 282a79426e..266a7a4c86 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponent.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponent.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QtGraphicalEffects 1.0 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml b/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml index cedff9183e..d475a6600b 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml index d6057d4df7..e58bc7e97c 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml index fbebba083d..1abe5caf87 100644 --- a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml index 555ef689a8..68472e8f37 100644 --- a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml index 9b5cca62e1..1c36cc0922 100644 --- a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml index 73fd7014ea..ae77d193d9 100644 --- a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml index 25e3cf261b..ef2c32ce3f 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml index d85d3dbd63..525a2dc9ee 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml index ccfa5a3b8d..8523a91617 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index d54aa61fd9..7b7bc5c417 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml index 909d571bf6..7991e829f4 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml @@ -12,8 +12,8 @@ /// @brief Battery, propeller and magnetometer summary /// @author Gus Grubba -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.qml b/src/AutoPilotPlugins/PX4/SafetyComponent.qml index 66ccedf57b..f15c98e7a1 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml index 0744e1f983..cb51780cc6 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.qml b/src/AutoPilotPlugins/PX4/SensorsComponent.qml index 9018f733e3..5de13849c6 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponent.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml index 751bc22280..675ea9426b 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml index 711ff75cf1..760a75f9bd 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/FactSystem/FactControls/FactBitmask.qml b/src/FactSystem/FactControls/FactBitmask.qml index 6e970829ee..11efcba86f 100644 --- a/src/FactSystem/FactControls/FactBitmask.qml +++ b/src/FactSystem/FactControls/FactBitmask.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.Palette 1.0 diff --git a/src/FactSystem/FactControls/FactCheckBox.qml b/src/FactSystem/FactControls/FactCheckBox.qml index 3f9cd2eee4..d830e2f83e 100644 --- a/src/FactSystem/FactControls/FactCheckBox.qml +++ b/src/FactSystem/FactControls/FactCheckBox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 diff --git a/src/FactSystem/FactControls/FactComboBox.qml b/src/FactSystem/FactControls/FactComboBox.qml index 9ab25c77ab..1afe2cbf91 100644 --- a/src/FactSystem/FactControls/FactComboBox.qml +++ b/src/FactSystem/FactControls/FactComboBox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 diff --git a/src/FactSystem/FactControls/FactLabel.qml b/src/FactSystem/FactControls/FactLabel.qml index d1c7e02eaa..e44fef7e0c 100644 --- a/src/FactSystem/FactControls/FactLabel.qml +++ b/src/FactSystem/FactControls/FactLabel.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 diff --git a/src/FactSystem/FactControls/FactPanel.qml b/src/FactSystem/FactControls/FactPanel.qml index 3c72bc9585..43aadeff9c 100644 --- a/src/FactSystem/FactControls/FactPanel.qml +++ b/src/FactSystem/FactControls/FactPanel.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FactSystem/FactControls/FactTextField.qml b/src/FactSystem/FactControls/FactTextField.qml index 4f4f032a8e..a4214a1ad7 100644 --- a/src/FactSystem/FactControls/FactTextField.qml +++ b/src/FactSystem/FactControls/FactTextField.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/FactSystem/FactControls/FactTextFieldGrid.qml b/src/FactSystem/FactControls/FactTextFieldGrid.qml index 3d21daeb1c..dee0c22368 100644 --- a/src/FactSystem/FactControls/FactTextFieldGrid.qml +++ b/src/FactSystem/FactControls/FactTextFieldGrid.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Layouts 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FactSystem/FactControls/FactTextFieldRow.qml b/src/FactSystem/FactControls/FactTextFieldRow.qml index 704317e0d9..701e6bd52e 100644 --- a/src/FactSystem/FactControls/FactTextFieldRow.qml +++ b/src/FactSystem/FactControls/FactTextFieldRow.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Layouts 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FactSystem/FactSystemTest.qml b/src/FactSystem/FactSystemTest.qml index 6d35e3c655..c7c696d924 100644 --- a/src/FactSystem/FactSystemTest.qml +++ b/src/FactSystem/FactSystemTest.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/FirmwarePlugin/APM/APMSensorParams.qml b/src/FirmwarePlugin/APM/APMSensorParams.qml index c3c62355a4..18a73b9e31 100644 --- a/src/FirmwarePlugin/APM/APMSensorParams.qml +++ b/src/FirmwarePlugin/APM/APMSensorParams.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.FactSystem 1.0 diff --git a/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml b/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml index feddf1c42c..a07ead1940 100644 --- a/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml +++ b/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml b/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml index 21c0148e17..d3a954b9a6 100644 --- a/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml +++ b/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml @@ -1,6 +1,6 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/NoGeoFenceEditor.qml b/src/FirmwarePlugin/NoGeoFenceEditor.qml index e6a2b99d47..e324f77794 100644 --- a/src/FirmwarePlugin/NoGeoFenceEditor.qml +++ b/src/FirmwarePlugin/NoGeoFenceEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml b/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml index f8670dbe55..cc556100aa 100644 --- a/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml +++ b/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index c099bddea8..1000a4d396 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -8,13 +8,13 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtLocation 5.6 -import QtPositioning 5.5 -import QtMultimedia 5.8 +import QtLocation 5.3 +import QtPositioning 5.3 +import QtMultimedia 5.5 import QGroundControl 1.0 import QGroundControl.FlightDisplay 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewDummy.qml b/src/FlightDisplay/FlightDisplayViewDummy.qml index b53a99e3b2..5e9250d681 100644 --- a/src/FlightDisplay/FlightDisplayViewDummy.qml +++ b/src/FlightDisplay/FlightDisplayViewDummy.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 Rectangle { anchors.fill: parent diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml index 3eb5c47fd9..d76bb79274 100644 --- a/src/FlightDisplay/FlightDisplayViewMap.qml +++ b/src/FlightDisplay/FlightDisplayViewMap.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.FlightDisplay 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewUVC.qml b/src/FlightDisplay/FlightDisplayViewUVC.qml index bb011c5508..10b768a8c6 100644 --- a/src/FlightDisplay/FlightDisplayViewUVC.qml +++ b/src/FlightDisplay/FlightDisplayViewUVC.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtMultimedia 5.8 +import QtQuick 2.3 +import QtMultimedia 5.5 import QGroundControl 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml index 454360ba01..958723498d 100644 --- a/src/FlightDisplay/FlightDisplayViewVideo.qml +++ b/src/FlightDisplay/FlightDisplayViewVideo.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.FlightDisplay 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index 3b3f41d6ee..952c07eaec 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -8,12 +8,12 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightDisplay/MultiVehicleList.qml b/src/FlightDisplay/MultiVehicleList.qml index 15cb3f9e1b..3928f36ca5 100644 --- a/src/FlightDisplay/MultiVehicleList.qml +++ b/src/FlightDisplay/MultiVehicleList.qml @@ -7,9 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightDisplay/VirtualJoystick.qml b/src/FlightDisplay/VirtualJoystick.qml index c5e4fa70d5..e49cd21227 100644 --- a/src/FlightDisplay/VirtualJoystick.qml +++ b/src/FlightDisplay/VirtualJoystick.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml index 3192baeffd..6204540d57 100644 --- a/src/FlightMap/FlightMap.qml +++ b/src/FlightMap/FlightMap.qml @@ -14,10 +14,10 @@ * @author Gus Grubba */ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/FlightMap/MapItems/MissionItemIndicator.qml b/src/FlightMap/MapItems/MissionItemIndicator.qml index 016891b8fe..2130d68fe3 100644 --- a/src/FlightMap/MapItems/MissionItemIndicator.qml +++ b/src/FlightMap/MapItems/MissionItemIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtLocation 5.6 +import QtQuick 2.3 +import QtLocation 5.3 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml index cfda94fda0..d9b3d5e2b5 100644 --- a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml +++ b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtLocation 5.6 +import QtQuick 2.3 +import QtLocation 5.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/MapItems/MissionItemView.qml b/src/FlightMap/MapItems/MissionItemView.qml index fa0a8810c4..3ee6a129ca 100644 --- a/src/FlightMap/MapItems/MissionItemView.qml +++ b/src/FlightMap/MapItems/MissionItemView.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.FlightMap 1.0 diff --git a/src/FlightMap/MapItems/MissionLineView.qml b/src/FlightMap/MapItems/MissionLineView.qml index 959ac1bb73..5489bebc34 100644 --- a/src/FlightMap/MapItems/MissionLineView.qml +++ b/src/FlightMap/MapItems/MissionLineView.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/FlightMap/MapItems/PolygonEditor.qml b/src/FlightMap/MapItems/PolygonEditor.qml index a3cba825cb..8935606baa 100644 --- a/src/FlightMap/MapItems/PolygonEditor.qml +++ b/src/FlightMap/MapItems/PolygonEditor.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtLocation 5.6 +import QtQuick 2.3 +import QtLocation 5.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 @@ -69,8 +69,8 @@ Item { adjustingPolygon = true for (var i=0; i -import QtQuick 2.7 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl.ScreenTools 1.0 import QGroundControl.Vehicle 1.0 diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml index 46ad0f33f4..9934a2b735 100644 --- a/src/FlightMap/MapScale.qml +++ b/src/FlightMap/MapScale.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/QGCVideoBackground.qml b/src/FlightMap/QGCVideoBackground.qml index ba1ee9f08e..ee264f6a07 100644 --- a/src/FlightMap/QGCVideoBackground.qml +++ b/src/FlightMap/QGCVideoBackground.qml @@ -14,8 +14,8 @@ * @author Gus Grubba */ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.QgcQtGStreamer 1.0 VideoItem { diff --git a/src/FlightMap/Widgets/CameraWidget.qml b/src/FlightMap/Widgets/CameraWidget.qml index 8f3aa7724b..080bfd372d 100644 --- a/src/FlightMap/Widgets/CameraWidget.qml +++ b/src/FlightMap/Widgets/CameraWidget.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/CenterMapDropButton.qml b/src/FlightMap/Widgets/CenterMapDropButton.qml index 67c8bb0ee3..2965f48e4d 100644 --- a/src/FlightMap/Widgets/CenterMapDropButton.qml +++ b/src/FlightMap/Widgets/CenterMapDropButton.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/Widgets/CenterMapDropPanel.qml b/src/FlightMap/Widgets/CenterMapDropPanel.qml index ac14217b6e..59652180c2 100644 --- a/src/FlightMap/Widgets/CenterMapDropPanel.qml +++ b/src/FlightMap/Widgets/CenterMapDropPanel.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/Widgets/CompassRing.qml b/src/FlightMap/Widgets/CompassRing.qml index 440174df42..b6c74ed2dd 100644 --- a/src/FlightMap/Widgets/CompassRing.qml +++ b/src/FlightMap/Widgets/CompassRing.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QtGraphicalEffects 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/InstrumentSwipeView.qml b/src/FlightMap/Widgets/InstrumentSwipeView.qml index cea7f46a0b..a1eaf5f408 100644 --- a/src/FlightMap/Widgets/InstrumentSwipeView.qml +++ b/src/FlightMap/Widgets/InstrumentSwipeView.qml @@ -1,6 +1,6 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/Widgets/MapFitFunctions.qml b/src/FlightMap/Widgets/MapFitFunctions.qml index 155daa8ef1..698388788e 100644 --- a/src/FlightMap/Widgets/MapFitFunctions.qml +++ b/src/FlightMap/Widgets/MapFitFunctions.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtPositioning 5.3 import QGroundControl 1.0 diff --git a/src/FlightMap/Widgets/QGCArtificialHorizon.qml b/src/FlightMap/Widgets/QGCArtificialHorizon.qml index f37dd0cff3..2165cfb17a 100644 --- a/src/FlightMap/Widgets/QGCArtificialHorizon.qml +++ b/src/FlightMap/Widgets/QGCArtificialHorizon.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.7 +import QtQuick 2.3 Item { id: root diff --git a/src/FlightMap/Widgets/QGCAttitudeHUD.qml b/src/FlightMap/Widgets/QGCAttitudeHUD.qml index ac11eb010f..2afe33d521 100644 --- a/src/FlightMap/Widgets/QGCAttitudeHUD.qml +++ b/src/FlightMap/Widgets/QGCAttitudeHUD.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.ScreenTools 1.0 Item { diff --git a/src/FlightMap/Widgets/QGCAttitudeWidget.qml b/src/FlightMap/Widgets/QGCAttitudeWidget.qml index 0d62241003..ed2803af63 100644 --- a/src/FlightMap/Widgets/QGCAttitudeWidget.qml +++ b/src/FlightMap/Widgets/QGCAttitudeWidget.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.7 +import QtQuick 2.3 import QtGraphicalEffects 1.0 import QGroundControl 1.0 diff --git a/src/FlightMap/Widgets/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml index 431e2a8a26..1c4b328e60 100644 --- a/src/FlightMap/Widgets/QGCCompassWidget.qml +++ b/src/FlightMap/Widgets/QGCCompassWidget.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.7 +import QtQuick 2.3 import QtGraphicalEffects 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/QGCInstrumentWidget.qml b/src/FlightMap/Widgets/QGCInstrumentWidget.qml index 85039a67f8..15c7fade96 100644 --- a/src/FlightMap/Widgets/QGCInstrumentWidget.qml +++ b/src/FlightMap/Widgets/QGCInstrumentWidget.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml b/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml index dec8863372..3bf190a925 100644 --- a/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml +++ b/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/QGCPitchIndicator.qml b/src/FlightMap/Widgets/QGCPitchIndicator.qml index c7ca4c81ce..6cc61ca131 100644 --- a/src/FlightMap/Widgets/QGCPitchIndicator.qml +++ b/src/FlightMap/Widgets/QGCPitchIndicator.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/ValuesWidget.qml b/src/FlightMap/Widgets/ValuesWidget.qml index 46bcea1e33..f9495390a9 100644 --- a/src/FlightMap/Widgets/ValuesWidget.qml +++ b/src/FlightMap/Widgets/ValuesWidget.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/Widgets/VehicleHealthWidget.qml b/src/FlightMap/Widgets/VehicleHealthWidget.qml index 680f9cb4a4..3e7a35c929 100644 --- a/src/FlightMap/Widgets/VehicleHealthWidget.qml +++ b/src/FlightMap/Widgets/VehicleHealthWidget.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/VibrationWidget.qml b/src/FlightMap/Widgets/VibrationWidget.qml index b24132ebc5..f5aeff5351 100644 --- a/src/FlightMap/Widgets/VibrationWidget.qml +++ b/src/FlightMap/Widgets/VibrationWidget.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/FWLandingPatternEditor.qml b/src/MissionEditor/FWLandingPatternEditor.qml index 2fbdf09829..fe0e35f104 100644 --- a/src/MissionEditor/FWLandingPatternEditor.qml +++ b/src/MissionEditor/FWLandingPatternEditor.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/FWLandingPatternMapVisual.qml b/src/MissionEditor/FWLandingPatternMapVisual.qml index 0ccc00b681..48aae1aea2 100644 --- a/src/MissionEditor/FWLandingPatternMapVisual.qml +++ b/src/MissionEditor/FWLandingPatternMapVisual.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/GeoFenceEditor.qml b/src/MissionEditor/GeoFenceEditor.qml index e430dd5db6..19aec35e5d 100644 --- a/src/MissionEditor/GeoFenceEditor.qml +++ b/src/MissionEditor/GeoFenceEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index d3ca1e72c9..4c656ae47d 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -8,12 +8,12 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtLocation 5.6 -import QtPositioning 5.5 -import QtQuick.Layouts 1.3 +import QtLocation 5.3 +import QtPositioning 5.3 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.FlightMap 1.0 diff --git a/src/MissionEditor/MissionItemEditor.qml b/src/MissionEditor/MissionItemEditor.qml index 913a85ae10..2b9942d201 100644 --- a/src/MissionEditor/MissionItemEditor.qml +++ b/src/MissionEditor/MissionItemEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/MissionEditor/MissionItemMapVisual.qml b/src/MissionEditor/MissionItemMapVisual.qml index 0508eb7579..b86111a565 100644 --- a/src/MissionEditor/MissionItemMapVisual.qml +++ b/src/MissionEditor/MissionItemMapVisual.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/MissionEditor/MissionItemStatus.qml b/src/MissionEditor/MissionItemStatus.qml index 9c508cec6f..692a16514c 100644 --- a/src/MissionEditor/MissionItemStatus.qml +++ b/src/MissionEditor/MissionItemStatus.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 diff --git a/src/MissionEditor/MissionSettingsEditor.qml b/src/MissionEditor/MissionSettingsEditor.qml index 337927a243..e68ec7421e 100644 --- a/src/MissionEditor/MissionSettingsEditor.qml +++ b/src/MissionEditor/MissionSettingsEditor.qml @@ -1,6 +1,6 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/QGCMapPolygonControls.qml b/src/MissionEditor/QGCMapPolygonControls.qml index 11d6a70ab8..114f05bb34 100644 --- a/src/MissionEditor/QGCMapPolygonControls.qml +++ b/src/MissionEditor/QGCMapPolygonControls.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 diff --git a/src/MissionEditor/RallyPointEditorHeader.qml b/src/MissionEditor/RallyPointEditorHeader.qml index 1f45d9fee8..4e271b51af 100644 --- a/src/MissionEditor/RallyPointEditorHeader.qml +++ b/src/MissionEditor/RallyPointEditorHeader.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/RallyPointItemEditor.qml b/src/MissionEditor/RallyPointItemEditor.qml index ff3805a5b5..b6b36ed07f 100644 --- a/src/MissionEditor/RallyPointItemEditor.qml +++ b/src/MissionEditor/RallyPointItemEditor.qml @@ -1,6 +1,6 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl.ScreenTools 1.0 import QGroundControl.Vehicle 1.0 diff --git a/src/MissionEditor/SimpleItemEditor.qml b/src/MissionEditor/SimpleItemEditor.qml index b4aa79b792..8ce994eeef 100644 --- a/src/MissionEditor/SimpleItemEditor.qml +++ b/src/MissionEditor/SimpleItemEditor.qml @@ -1,8 +1,8 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl.ScreenTools 1.0 import QGroundControl.Vehicle 1.0 diff --git a/src/MissionEditor/SimpleItemMapVisual.qml b/src/MissionEditor/SimpleItemMapVisual.qml index 0c5708e67e..59f6c0acf3 100644 --- a/src/MissionEditor/SimpleItemMapVisual.qml +++ b/src/MissionEditor/SimpleItemMapVisual.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml index 349e54fb9d..d45c3a797e 100644 --- a/src/MissionEditor/SurveyItemEditor.qml +++ b/src/MissionEditor/SurveyItemEditor.qml @@ -1,7 +1,7 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/SurveyMapVisual.qml b/src/MissionEditor/SurveyMapVisual.qml index cfbdb092c5..d680520341 100644 --- a/src/MissionEditor/SurveyMapVisual.qml +++ b/src/MissionEditor/SurveyMapVisual.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MultiVehicle/MultiVehicleView.qml b/src/MultiVehicle/MultiVehicleView.qml index c7125ffcbf..0637399436 100644 --- a/src/MultiVehicle/MultiVehicleView.qml +++ b/src/MultiVehicle/MultiVehicleView.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml index 4b2d62a194..5362e9d167 100644 --- a/src/QmlControls/AppMessages.qml +++ b/src/QmlControls/AppMessages.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/QmlControls/ClickableColor.qml b/src/QmlControls/ClickableColor.qml index 52fc16accf..69686b9ab9 100644 --- a/src/QmlControls/ClickableColor.qml +++ b/src/QmlControls/ClickableColor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 Rectangle { diff --git a/src/QmlControls/DropButton.qml b/src/QmlControls/DropButton.qml index e5f79dbb3f..ceb0cf48a8 100644 --- a/src/QmlControls/DropButton.qml +++ b/src/QmlControls/DropButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl 1.0 diff --git a/src/QmlControls/DropPanel.qml b/src/QmlControls/DropPanel.qml index 7c606cf352..11c00e99ab 100644 --- a/src/QmlControls/DropPanel.qml +++ b/src/QmlControls/DropPanel.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl 1.0 diff --git a/src/QmlControls/ExclusiveGroupItem.qml b/src/QmlControls/ExclusiveGroupItem.qml index 1e7ade2e4a..0e89b8cf4b 100644 --- a/src/QmlControls/ExclusiveGroupItem.qml +++ b/src/QmlControls/ExclusiveGroupItem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 /// The ExclusiveGroupItem control can be used as a base class for a control which diff --git a/src/QmlControls/FactSliderPanel.qml b/src/QmlControls/FactSliderPanel.qml index fd9259f782..3ed30f4694 100644 --- a/src/QmlControls/FactSliderPanel.qml +++ b/src/QmlControls/FactSliderPanel.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/QmlControls/FlightModeDropdown.qml b/src/QmlControls/FlightModeDropdown.qml index d32823edab..20766eb650 100644 --- a/src/QmlControls/FlightModeDropdown.qml +++ b/src/QmlControls/FlightModeDropdown.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/FlightModeMenu.qml b/src/QmlControls/FlightModeMenu.qml index 35ad1c506f..9b553a3951 100644 --- a/src/QmlControls/FlightModeMenu.qml +++ b/src/QmlControls/FlightModeMenu.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/GuidedBar.qml b/src/QmlControls/GuidedBar.qml index 8cad2aad10..c7f03226df 100644 --- a/src/QmlControls/GuidedBar.qml +++ b/src/QmlControls/GuidedBar.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/IndicatorButton.qml b/src/QmlControls/IndicatorButton.qml index df924f648b..c8d3347374 100644 --- a/src/QmlControls/IndicatorButton.qml +++ b/src/QmlControls/IndicatorButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/JoystickThumbPad.qml b/src/QmlControls/JoystickThumbPad.qml index 90e954f0b6..5b3e816950 100644 --- a/src/QmlControls/JoystickThumbPad.qml +++ b/src/QmlControls/JoystickThumbPad.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/MissionCommandDialog.qml b/src/QmlControls/MissionCommandDialog.qml index b0a73ee835..5320d69f3b 100644 --- a/src/QmlControls/MissionCommandDialog.qml +++ b/src/QmlControls/MissionCommandDialog.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/MissionItemIndexLabel.qml b/src/QmlControls/MissionItemIndexLabel.qml index 746d14d6cf..d09cc4c10a 100644 --- a/src/QmlControls/MissionItemIndexLabel.qml +++ b/src/QmlControls/MissionItemIndexLabel.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ModeSwitchDisplay.qml b/src/QmlControls/ModeSwitchDisplay.qml index 0322c6ac35..85a1c10459 100644 --- a/src/QmlControls/ModeSwitchDisplay.qml +++ b/src/QmlControls/ModeSwitchDisplay.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/MultiRotorMotorDisplay.qml b/src/QmlControls/MultiRotorMotorDisplay.qml index cec5646129..647aa1d7ea 100644 --- a/src/QmlControls/MultiRotorMotorDisplay.qml +++ b/src/QmlControls/MultiRotorMotorDisplay.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/OfflineMapButton.qml b/src/QmlControls/OfflineMapButton.qml index 63f391933c..8df92397e6 100644 --- a/src/QmlControls/OfflineMapButton.qml +++ b/src/QmlControls/OfflineMapButton.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 1d1ed8d3cd..a56f3151b1 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml index 0614f1064e..c36fbf0d15 100644 --- a/src/QmlControls/ParameterEditorDialog.qml +++ b/src/QmlControls/ParameterEditorDialog.qml @@ -7,9 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index 123faa6ab5..f9cbe88358 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCCheckBox.qml b/src/QmlControls/QGCCheckBox.qml index 6628460e7c..424e244438 100644 --- a/src/QmlControls/QGCCheckBox.qml +++ b/src/QmlControls/QGCCheckBox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCColoredImage.qml b/src/QmlControls/QGCColoredImage.qml index 455f67c439..58a0ff2136 100644 --- a/src/QmlControls/QGCColoredImage.qml +++ b/src/QmlControls/QGCColoredImage.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.0 diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index bd9cf29673..ce734073fe 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCFlickable.qml b/src/QmlControls/QGCFlickable.qml index b7ed79d53b..c86fd39b1a 100644 --- a/src/QmlControls/QGCFlickable.qml +++ b/src/QmlControls/QGCFlickable.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCFlickableHorizontalIndicator.qml b/src/QmlControls/QGCFlickableHorizontalIndicator.qml index 35b05c28be..46216aa51c 100644 --- a/src/QmlControls/QGCFlickableHorizontalIndicator.qml +++ b/src/QmlControls/QGCFlickableHorizontalIndicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.3 Rectangle { id: horizontalIndicator diff --git a/src/QmlControls/QGCFlickableVerticalIndicator.qml b/src/QmlControls/QGCFlickableVerticalIndicator.qml index 4365d1bd6f..5844c7dc09 100644 --- a/src/QmlControls/QGCFlickableVerticalIndicator.qml +++ b/src/QmlControls/QGCFlickableVerticalIndicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.3 Rectangle { id: verticalIndicator diff --git a/src/QmlControls/QGCGroupBox.qml b/src/QmlControls/QGCGroupBox.qml index b9570c5c3a..196ef18078 100644 --- a/src/QmlControls/QGCGroupBox.qml +++ b/src/QmlControls/QGCGroupBox.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCLabel.qml b/src/QmlControls/QGCLabel.qml index 56b00aaed9..32176837c8 100644 --- a/src/QmlControls/QGCLabel.qml +++ b/src/QmlControls/QGCLabel.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCListView.qml b/src/QmlControls/QGCListView.qml index 4f5a447d82..104bb3cbad 100644 --- a/src/QmlControls/QGCListView.qml +++ b/src/QmlControls/QGCListView.qml @@ -1,4 +1,4 @@ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCMapLabel.qml b/src/QmlControls/QGCMapLabel.qml index 8f243f1d74..2d5639f551 100644 --- a/src/QmlControls/QGCMapLabel.qml +++ b/src/QmlControls/QGCMapLabel.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCMobileFileOpenDialog.qml b/src/QmlControls/QGCMobileFileOpenDialog.qml index a2d9b0f694..02873ea714 100644 --- a/src/QmlControls/QGCMobileFileOpenDialog.qml +++ b/src/QmlControls/QGCMobileFileOpenDialog.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/QGCMobileFileSaveDialog.qml b/src/QmlControls/QGCMobileFileSaveDialog.qml index 654a35443f..cf46485d0d 100644 --- a/src/QmlControls/QGCMobileFileSaveDialog.qml +++ b/src/QmlControls/QGCMobileFileSaveDialog.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/QGCMovableItem.qml b/src/QmlControls/QGCMovableItem.qml index 8f683ae514..3f2b2f9e94 100644 --- a/src/QmlControls/QGCMovableItem.qml +++ b/src/QmlControls/QGCMovableItem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.ScreenTools 1.0 // This item can be dragged around within its parent. diff --git a/src/QmlControls/QGCPipable.qml b/src/QmlControls/QGCPipable.qml index a8d7161563..2294835a0e 100644 --- a/src/QmlControls/QGCPipable.qml +++ b/src/QmlControls/QGCPipable.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCRadioButton.qml b/src/QmlControls/QGCRadioButton.qml index 82578fac43..4eba07f153 100644 --- a/src/QmlControls/QGCRadioButton.qml +++ b/src/QmlControls/QGCRadioButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCSlider.qml b/src/QmlControls/QGCSlider.qml index 6da123cef8..1bbd2f18ec 100644 --- a/src/QmlControls/QGCSlider.qml +++ b/src/QmlControls/QGCSlider.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index 540e8fd548..1c7902135a 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -1,7 +1,7 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCToolBarButton.qml b/src/QmlControls/QGCToolBarButton.qml index ad3dbee22d..c73ec75b83 100644 --- a/src/QmlControls/QGCToolBarButton.qml +++ b/src/QmlControls/QGCToolBarButton.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCView.qml b/src/QmlControls/QGCView.qml index e83b042c1c..3bced362f7 100644 --- a/src/QmlControls/QGCView.qml +++ b/src/QmlControls/QGCView.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QGCViewDialog.qml b/src/QmlControls/QGCViewDialog.qml index 2af33e4aeb..f8d1443569 100644 --- a/src/QmlControls/QGCViewDialog.qml +++ b/src/QmlControls/QGCViewDialog.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCViewMessage.qml b/src/QmlControls/QGCViewMessage.qml index 0e9ae00c5a..9d58df0bb8 100644 --- a/src/QmlControls/QGCViewMessage.qml +++ b/src/QmlControls/QGCViewMessage.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCViewPanel.qml b/src/QmlControls/QGCViewPanel.qml index 51eb109a64..cd179138f7 100644 --- a/src/QmlControls/QGCViewPanel.qml +++ b/src/QmlControls/QGCViewPanel.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Palette 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QmlTest.qml b/src/QmlControls/QmlTest.qml index 9970976bb5..554179daaa 100644 --- a/src/QmlControls/QmlTest.qml +++ b/src/QmlControls/QmlTest.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/RCChannelMonitor.qml b/src/QmlControls/RCChannelMonitor.qml index 72f7961730..e98b7116f5 100644 --- a/src/QmlControls/RCChannelMonitor.qml +++ b/src/QmlControls/RCChannelMonitor.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/RoundButton.qml b/src/QmlControls/RoundButton.qml index 25131881e8..dc58856dd6 100644 --- a/src/QmlControls/RoundButton.qml +++ b/src/QmlControls/RoundButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index 4147df2654..84fa4b7c20 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/src/QmlControls/ScreenTools.qml @@ -1,7 +1,7 @@ pragma Singleton -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Window 2.2 import QGroundControl 1.0 diff --git a/src/QmlControls/SliderSwitch.qml b/src/QmlControls/SliderSwitch.qml index 0d6d59d258..ae51d4b666 100644 --- a/src/QmlControls/SliderSwitch.qml +++ b/src/QmlControls/SliderSwitch.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml index 47211badf5..d7e3dbb8fc 100644 --- a/src/QmlControls/SubMenuButton.qml +++ b/src/QmlControls/SubMenuButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.0 diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml index dbd5e98ea0..b7f75f8bd1 100644 --- a/src/QmlControls/ToolStrip.qml +++ b/src/QmlControls/ToolStrip.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/VehicleRotationCal.qml b/src/QmlControls/VehicleRotationCal.qml index 350fd5ee31..3af615c286 100644 --- a/src/QmlControls/VehicleRotationCal.qml +++ b/src/QmlControls/VehicleRotationCal.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/VehicleSummaryRow.qml b/src/QmlControls/VehicleSummaryRow.qml index 0e0e29078c..e3d125dc27 100644 --- a/src/QmlControls/VehicleSummaryRow.qml +++ b/src/QmlControls/VehicleSummaryRow.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 Row { diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index 808ba02b4e..5ba394de30 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -7,13 +7,13 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick.Layouts 1.2 +import QtLocation 5.3 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index 372fff58d1..d20ee29313 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index 30234cd7d2..3ac79d475f 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/VehicleSetup/PX4FlowSensor.qml b/src/VehicleSetup/PX4FlowSensor.qml index a28962dd68..bae6244eb9 100644 --- a/src/VehicleSetup/PX4FlowSensor.qml +++ b/src/VehicleSetup/PX4FlowSensor.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/VehicleSetup/SetupParameterEditor.qml b/src/VehicleSetup/SetupParameterEditor.qml index bd1bdafa16..9f1b2008fe 100644 --- a/src/VehicleSetup/SetupParameterEditor.qml +++ b/src/VehicleSetup/SetupParameterEditor.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml index 5ca18bb532..ac1156397c 100644 --- a/src/VehicleSetup/SetupView.qml +++ b/src/VehicleSetup/SetupView.qml @@ -12,8 +12,8 @@ /// @brief Setup View /// @author Don Gagne -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.AutoPilotPlugin 1.0 diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index 27b7eb7e85..a26d6df93c 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl 1.0 diff --git a/src/ViewWidgets/CustomCommandWidget.qml b/src/ViewWidgets/CustomCommandWidget.qml index af49f6352a..c73ed1635d 100644 --- a/src/ViewWidgets/CustomCommandWidget.qml +++ b/src/ViewWidgets/CustomCommandWidget.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/ViewWidgets/ViewWidget.qml b/src/ViewWidgets/ViewWidget.qml index 16124cfa70..04c0c2f143 100644 --- a/src/ViewWidgets/ViewWidget.qml +++ b/src/ViewWidgets/ViewWidget.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/test.qml b/src/test.qml index 017b53bffd..988f1c5f2b 100644 --- a/src/test.qml +++ b/src/test.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QGroundControl.FactControls 1.0 diff --git a/src/ui/AppSettings.qml b/src/ui/AppSettings.qml index 505e7aae7d..80bb69fa59 100644 --- a/src/ui/AppSettings.qml +++ b/src/ui/AppSettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtPositioning 5.5 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/ui/MainWindowHybrid.qml b/src/ui/MainWindowHybrid.qml index 011412f919..408ea37a94 100644 --- a/src/ui/MainWindowHybrid.qml +++ b/src/ui/MainWindowHybrid.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml index 2768a0af49..6e5d2d9958 100644 --- a/src/ui/MainWindowInner.qml +++ b/src/ui/MainWindowInner.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 -import QtPositioning 5.5 +import QtPositioning 5.3 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/ui/MainWindowNative.qml b/src/ui/MainWindowNative.qml index ded0dce50b..1b7cbe17ef 100644 --- a/src/ui/MainWindowNative.qml +++ b/src/ui/MainWindowNative.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 diff --git a/src/ui/preferences/BluetoothSettings.qml b/src/ui/preferences/BluetoothSettings.qml index c111acbb2d..375759186c 100644 --- a/src/ui/preferences/BluetoothSettings.qml +++ b/src/ui/preferences/BluetoothSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/DebugWindow.qml b/src/ui/preferences/DebugWindow.qml index 3e8ddb6da2..c070de8108 100644 --- a/src/ui/preferences/DebugWindow.qml +++ b/src/ui/preferences/DebugWindow.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.2 import QtQuick.Window 2.2 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index d80dc44397..e6372e7229 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -8,12 +8,12 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtMultimedia 5.8 -import QtQuick.Layouts 1.3 +import QtMultimedia 5.5 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/ui/preferences/LinkSettings.qml b/src/ui/preferences/LinkSettings.qml index cb0a234ab2..cb49848f17 100644 --- a/src/ui/preferences/LinkSettings.qml +++ b/src/ui/preferences/LinkSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/LogReplaySettings.qml b/src/ui/preferences/LogReplaySettings.qml index 511c8b4312..079fe5461d 100644 --- a/src/ui/preferences/LogReplaySettings.qml +++ b/src/ui/preferences/LogReplaySettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/MavlinkSettings.qml b/src/ui/preferences/MavlinkSettings.qml index f52ab0fee9..333cee9e86 100644 --- a/src/ui/preferences/MavlinkSettings.qml +++ b/src/ui/preferences/MavlinkSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/ui/preferences/MockLink.qml b/src/ui/preferences/MockLink.qml index c850ae2ddb..5c5e476fd4 100644 --- a/src/ui/preferences/MockLink.qml +++ b/src/ui/preferences/MockLink.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/MockLinkSettings.qml b/src/ui/preferences/MockLinkSettings.qml index 47d6d35c83..e7d5cf1084 100644 --- a/src/ui/preferences/MockLinkSettings.qml +++ b/src/ui/preferences/MockLinkSettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/SerialSettings.qml b/src/ui/preferences/SerialSettings.qml index afb3194183..07e4956050 100644 --- a/src/ui/preferences/SerialSettings.qml +++ b/src/ui/preferences/SerialSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/TcpSettings.qml b/src/ui/preferences/TcpSettings.qml index 9b040b3ed6..182cf4d616 100644 --- a/src/ui/preferences/TcpSettings.qml +++ b/src/ui/preferences/TcpSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/UdpSettings.qml b/src/ui/preferences/UdpSettings.qml index 5493031ea4..825b1bd79b 100644 --- a/src/ui/preferences/UdpSettings.qml +++ b/src/ui/preferences/UdpSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/toolbar/BatteryIndicator.qml b/src/ui/toolbar/BatteryIndicator.qml index 0a6242ab43..07bf24af40 100644 --- a/src/ui/toolbar/BatteryIndicator.qml +++ b/src/ui/toolbar/BatteryIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/GPSIndicator.qml b/src/ui/toolbar/GPSIndicator.qml index 0920867fc4..709a32884a 100644 --- a/src/ui/toolbar/GPSIndicator.qml +++ b/src/ui/toolbar/GPSIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index 058699eb05..1ee5aa2e46 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -7,9 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Layouts 1.2 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml index e212bc76ab..27e61fb35b 100644 --- a/src/ui/toolbar/MainToolBarIndicators.qml +++ b/src/ui/toolbar/MainToolBarIndicators.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MessageIndicator.qml b/src/ui/toolbar/MessageIndicator.qml index 186d059a77..1cb6057175 100644 --- a/src/ui/toolbar/MessageIndicator.qml +++ b/src/ui/toolbar/MessageIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/ModeIndicator.qml b/src/ui/toolbar/ModeIndicator.qml index b86c2b4cf0..20fdea306b 100644 --- a/src/ui/toolbar/ModeIndicator.qml +++ b/src/ui/toolbar/ModeIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.3 +import QtQuick.Controls 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/RCRSSIIndicator.qml b/src/ui/toolbar/RCRSSIIndicator.qml index bed0eddfd9..f4425a684f 100644 --- a/src/ui/toolbar/RCRSSIIndicator.qml +++ b/src/ui/toolbar/RCRSSIIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/SignalStrength.qml b/src/ui/toolbar/SignalStrength.qml index ada38752dd..942cb0b2b4 100644 --- a/src/ui/toolbar/SignalStrength.qml +++ b/src/ui/toolbar/SignalStrength.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.7 +import QtQuick 2.3 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/ui/toolbar/TelemetryRSSIIndicator.qml b/src/ui/toolbar/TelemetryRSSIIndicator.qml index bed7cd970c..eeac61e5be 100644 --- a/src/ui/toolbar/TelemetryRSSIIndicator.qml +++ b/src/ui/toolbar/TelemetryRSSIIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 -- GitLab