From 54857c1af27fa372ef2dd441eb7fb28902d91afb Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 2 Mar 2017 20:01:45 -0800 Subject: [PATCH] Fix incorrect import QtQuick.Controls --- src/AnalyzeView/AnalyzePage.qml | 2 +- src/AnalyzeView/AnalyzeView.qml | 2 +- src/AnalyzeView/GeoTagPage.qml | 2 +- src/AnalyzeView/LogDownloadPage.qml | 2 +- src/AutoPilotPlugins/APM/APMAirframeComponent.qml | 2 +- src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml | 2 +- src/AutoPilotPlugins/APM/APMCameraComponent.qml | 2 +- src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml | 2 +- src/AutoPilotPlugins/APM/APMFlightModesComponent.qml | 2 +- src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml | 2 +- src/AutoPilotPlugins/APM/APMLightsComponent.qml | 2 +- src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml | 2 +- src/AutoPilotPlugins/APM/APMPowerComponent.qml | 2 +- src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml | 2 +- src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml | 2 +- src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml | 2 +- src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml | 2 +- src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml | 2 +- src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml | 2 +- src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml | 2 +- src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml | 2 +- src/AutoPilotPlugins/APM/APMSensorsComponent.qml | 2 +- src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml | 2 +- src/AutoPilotPlugins/APM/APMSubFrameComponent.qml | 2 +- src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml | 2 +- src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml | 2 +- src/AutoPilotPlugins/Common/ESP8266Component.qml | 2 +- src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml | 2 +- src/AutoPilotPlugins/Common/MixersComponent.qml | 2 +- src/AutoPilotPlugins/Common/MotorComponent.qml | 2 +- src/AutoPilotPlugins/Common/RadioComponent.qml | 2 +- src/AutoPilotPlugins/Common/SetupPage.qml | 2 +- src/AutoPilotPlugins/PX4/AirframeComponent.qml | 2 +- src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml | 2 +- src/AutoPilotPlugins/PX4/CameraComponent.qml | 2 +- src/AutoPilotPlugins/PX4/CameraComponentSummary.qml | 2 +- src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml | 2 +- src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml | 2 +- src/AutoPilotPlugins/PX4/PX4FlightModes.qml | 2 +- src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml | 2 +- src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml | 2 +- src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml | 2 +- src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml | 2 +- src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml | 2 +- src/AutoPilotPlugins/PX4/PowerComponent.qml | 2 +- src/AutoPilotPlugins/PX4/PowerComponentSummary.qml | 2 +- src/AutoPilotPlugins/PX4/SafetyComponent.qml | 2 +- src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml | 2 +- src/AutoPilotPlugins/PX4/SensorsComponent.qml | 2 +- src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml | 2 +- src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml | 2 +- src/FactSystem/FactControls/FactBitmask.qml | 2 +- src/FactSystem/FactControls/FactCheckBox.qml | 2 +- src/FactSystem/FactControls/FactComboBox.qml | 2 +- src/FactSystem/FactControls/FactLabel.qml | 2 +- src/FactSystem/FactControls/FactPanel.qml | 2 +- src/FactSystem/FactControls/FactTextField.qml | 2 +- src/FactSystem/FactSystemTest.qml | 2 +- src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml | 2 +- src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml | 2 +- src/FirmwarePlugin/NoGeoFenceEditor.qml | 2 +- src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml | 2 +- src/FlightDisplay/FlightDisplayView.qml | 2 +- src/FlightDisplay/FlightDisplayViewMap.qml | 2 +- src/FlightDisplay/FlightDisplayViewVideo.qml | 2 +- src/FlightDisplay/FlightDisplayViewWidgets.qml | 2 +- src/FlightDisplay/MultiVehicleList.qml | 2 +- src/FlightMap/FlightMap.qml | 2 +- src/FlightMap/MapItems/MissionItemView.qml | 2 +- src/FlightMap/MapScale.qml | 2 +- src/FlightMap/QGCVideoBackground.qml | 2 +- src/FlightMap/Widgets/CenterMapDropButton.qml | 2 +- src/FlightMap/Widgets/CenterMapDropPanel.qml | 2 +- src/FlightMap/Widgets/InstrumentSwipeView.qml | 2 +- src/FlightMap/Widgets/VibrationWidget.qml | 2 +- src/MissionEditor/FWLandingPatternEditor.qml | 2 +- src/MissionEditor/FWLandingPatternMapVisual.qml | 2 +- src/MissionEditor/GeoFenceEditor.qml | 2 +- src/MissionEditor/MissionEditor.qml | 2 +- src/MissionEditor/MissionItemEditor.qml | 2 +- src/MissionEditor/MissionItemMapVisual.qml | 2 +- src/MissionEditor/MissionItemStatus.qml | 2 +- src/MissionEditor/MissionSettingsEditor.qml | 2 +- src/MissionEditor/QGCMapPolygonControls.qml | 2 +- src/MissionEditor/RallyPointEditorHeader.qml | 2 +- src/MissionEditor/RallyPointItemEditor.qml | 2 +- src/MissionEditor/SimpleItemEditor.qml | 2 +- src/MissionEditor/SimpleItemMapVisual.qml | 2 +- src/MissionEditor/SurveyItemEditor.qml | 2 +- src/MissionEditor/SurveyMapVisual.qml | 2 +- src/MultiVehicle/MultiVehicleView.qml | 2 +- src/QmlControls/AppMessages.qml | 2 +- src/QmlControls/ClickableColor.qml | 2 +- src/QmlControls/DropButton.qml | 2 +- src/QmlControls/DropPanel.qml | 2 +- src/QmlControls/ExclusiveGroupItem.qml | 2 +- src/QmlControls/FactSliderPanel.qml | 2 +- src/QmlControls/FlightModeMenu.qml | 2 +- src/QmlControls/IndicatorButton.qml | 2 +- src/QmlControls/JoystickThumbPad.qml | 2 +- src/QmlControls/MissionCommandDialog.qml | 2 +- src/QmlControls/MissionItemIndexLabel.qml | 2 +- src/QmlControls/ModeSwitchDisplay.qml | 2 +- src/QmlControls/OfflineMapButton.qml | 2 +- src/QmlControls/ParameterEditor.qml | 2 +- src/QmlControls/ParameterEditorDialog.qml | 2 +- src/QmlControls/QGCButton.qml | 2 +- src/QmlControls/QGCCheckBox.qml | 2 +- src/QmlControls/QGCColoredImage.qml | 2 +- src/QmlControls/QGCComboBox.qml | 2 +- src/QmlControls/QGCGroupBox.qml | 2 +- src/QmlControls/QGCLabel.qml | 2 +- src/QmlControls/QGCMapLabel.qml | 2 +- src/QmlControls/QGCMobileFileOpenDialog.qml | 2 +- src/QmlControls/QGCMobileFileSaveDialog.qml | 2 +- src/QmlControls/QGCMovableItem.qml | 2 +- src/QmlControls/QGCPipable.qml | 2 +- src/QmlControls/QGCRadioButton.qml | 2 +- src/QmlControls/QGCSlider.qml | 2 +- src/QmlControls/QGCTextField.qml | 2 +- src/QmlControls/QGCToolBarButton.qml | 2 +- src/QmlControls/QGCView.qml | 2 +- src/QmlControls/QGCViewDialog.qml | 2 +- src/QmlControls/QGCViewMessage.qml | 2 +- src/QmlControls/QGCViewPanel.qml | 2 +- src/QmlControls/QmlTest.qml | 2 +- src/QmlControls/RCChannelMonitor.qml | 2 +- src/QmlControls/RoundButton.qml | 2 +- src/QmlControls/ScreenTools.qml | 2 +- src/QmlControls/SliderSwitch.qml | 2 +- src/QmlControls/SubMenuButton.qml | 2 +- src/QmlControls/ToolStrip.qml | 2 +- src/QmlControls/VehicleRotationCal.qml | 2 +- src/QmlControls/VehicleSummaryRow.qml | 2 +- src/QtLocationPlugin/QMLControl/OfflineMap.qml | 2 +- src/VehicleSetup/FirmwareUpgrade.qml | 2 +- src/VehicleSetup/JoystickConfig.qml | 2 +- src/VehicleSetup/PX4FlowSensor.qml | 2 +- src/VehicleSetup/SetupParameterEditor.qml | 2 +- src/VehicleSetup/SetupView.qml | 2 +- src/VehicleSetup/VehicleSummary.qml | 2 +- src/ViewWidgets/CustomCommandWidget.qml | 2 +- src/ViewWidgets/ViewWidget.qml | 2 +- src/test.qml | 2 +- src/ui/AppSettings.qml | 2 +- src/ui/MainWindowHybrid.qml | 2 +- src/ui/MainWindowInner.qml | 2 +- src/ui/preferences/BluetoothSettings.qml | 2 +- src/ui/preferences/DebugWindow.qml | 2 +- src/ui/preferences/GeneralSettings.qml | 2 +- src/ui/preferences/LinkSettings.qml | 2 +- src/ui/preferences/LogReplaySettings.qml | 2 +- src/ui/preferences/MavlinkSettings.qml | 2 +- src/ui/preferences/MockLinkSettings.qml | 2 +- src/ui/preferences/SerialSettings.qml | 2 +- src/ui/preferences/TcpSettings.qml | 2 +- src/ui/preferences/UdpSettings.qml | 2 +- src/ui/toolbar/BatteryIndicator.qml | 2 +- src/ui/toolbar/GPSIndicator.qml | 2 +- src/ui/toolbar/MainToolBar.qml | 2 +- src/ui/toolbar/MainToolBarIndicators.qml | 2 +- src/ui/toolbar/MessageIndicator.qml | 2 +- src/ui/toolbar/ModeIndicator.qml | 2 +- src/ui/toolbar/RCRSSIIndicator.qml | 2 +- src/ui/toolbar/TelemetryRSSIIndicator.qml | 2 +- 165 files changed, 165 insertions(+), 165 deletions(-) diff --git a/src/AnalyzeView/AnalyzePage.qml b/src/AnalyzeView/AnalyzePage.qml index 9c656d46d..c7e2e0924 100644 --- a/src/AnalyzeView/AnalyzePage.qml +++ b/src/AnalyzeView/AnalyzePage.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AnalyzeView/AnalyzeView.qml b/src/AnalyzeView/AnalyzeView.qml index be374d623..89fb527ae 100644 --- a/src/AnalyzeView/AnalyzeView.qml +++ b/src/AnalyzeView/AnalyzeView.qml @@ -13,7 +13,7 @@ /// @author Don Gagne import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AnalyzeView/GeoTagPage.qml b/src/AnalyzeView/GeoTagPage.qml index 2d4801de0..625c94fcd 100644 --- a/src/AnalyzeView/GeoTagPage.qml +++ b/src/AnalyzeView/GeoTagPage.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AnalyzeView/LogDownloadPage.qml b/src/AnalyzeView/LogDownloadPage.qml index c7ead7fc0..79c263e86 100644 --- a/src/AnalyzeView/LogDownloadPage.qml +++ b/src/AnalyzeView/LogDownloadPage.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml index 877868e4a..bb0f4b826 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml index 3a19cfaf9..b962a8bef 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 7313a8678..2df39dbfb 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponent.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 d2c43a14e..d24ddb293 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 4aa4dc78c..a105c5e04 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 13764bba8..f61a17030 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 20e9ece4c..7be995158 100644 --- a/src/AutoPilotPlugins/APM/APMLightsComponent.qml +++ b/src/AutoPilotPlugins/APM/APMLightsComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 14f2ce702..a96c4f4d4 100644 --- a/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.qml b/src/AutoPilotPlugins/APM/APMPowerComponent.qml index 9fdf6c061..361b349cb 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml index 150bbb104..fa0c34f45 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 fff1bd288..2fe3b105a 100644 --- a/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 0f40671ea..a1ec061a5 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml index ec555748b..705535788 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml index d8b15d099..6a3b25d80 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml index d2ddc72ce..12c8ceaf3 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 b6b3b4a0c..f3da5bc02 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml index fd8ee5ea6..fd81d910a 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 e526a3d75..536311d3b 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml index f54b65c58..2f616eb43 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 cf3fbd4b3..26375d652 100644 --- a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml +++ b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 a3f2534ba..041c72880 100644 --- a/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 1b29887f1..314a4fa2b 100644 --- a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 563c08b8c..90fc2d601 100644 --- a/src/AutoPilotPlugins/Common/ESP8266Component.qml +++ b/src/AutoPilotPlugins/Common/ESP8266Component.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml index 6643b26ac..db6b7588b 100644 --- a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml +++ b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 595fa1928..9dcea5dec 100644 --- a/src/AutoPilotPlugins/Common/MixersComponent.qml +++ b/src/AutoPilotPlugins/Common/MixersComponent.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 a32e20369..b2e9a29a2 100644 --- a/src/AutoPilotPlugins/Common/MotorComponent.qml +++ b/src/AutoPilotPlugins/Common/MotorComponent.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/Common/RadioComponent.qml b/src/AutoPilotPlugins/Common/RadioComponent.qml index fa3ea6ae8..5c9b522ab 100644 --- a/src/AutoPilotPlugins/Common/RadioComponent.qml +++ b/src/AutoPilotPlugins/Common/RadioComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/Common/SetupPage.qml b/src/AutoPilotPlugins/Common/SetupPage.qml index 802319849..3a46d80a3 100644 --- a/src/AutoPilotPlugins/Common/SetupPage.qml +++ b/src/AutoPilotPlugins/Common/SetupPage.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.qml b/src/AutoPilotPlugins/PX4/AirframeComponent.qml index c469eb1a3..6dd546a34 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 206ee9b60..cb298cbf4 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 94e986123..282a79426 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponent.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 diff --git a/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml b/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml index 65d867787..cedff9183 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 ab8b06057..d6057d4df 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 fd3e46cd9..fbebba083 100644 --- a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml index 23baa4c86..555ef689a 100644 --- a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml index 925c51032..9b5cca62e 100644 --- a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 31989f4a6..73fd7014e 100644 --- a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 2985d71c0..25e3cf261 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml index f0c234d48..d85d3dbd6 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml index 02014fda8..ccfa5a3b8 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index 0bb3d5106..d54aa61fd 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml index 71fd74973..909d571bf 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml @@ -13,7 +13,7 @@ /// @author Gus Grubba import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 70b265f30..66ccedf57 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 diff --git a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml index 080592501..0744e1f98 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 d247ae504..9018f733e 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponent.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponent.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 5f824a07a..751bc2228 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 b324e8d2d..711ff75cf 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 8f22d3ed5..6e970829e 100644 --- a/src/FactSystem/FactControls/FactBitmask.qml +++ b/src/FactSystem/FactControls/FactBitmask.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 aebf434e7..3f9cd2eee 100644 --- a/src/FactSystem/FactControls/FactCheckBox.qml +++ b/src/FactSystem/FactControls/FactCheckBox.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 6f7837a13..9ab25c77a 100644 --- a/src/FactSystem/FactControls/FactComboBox.qml +++ b/src/FactSystem/FactControls/FactComboBox.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 e21588e56..d1c7e02ea 100644 --- a/src/FactSystem/FactControls/FactLabel.qml +++ b/src/FactSystem/FactControls/FactLabel.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 99e78f783..3c72bc958 100644 --- a/src/FactSystem/FactControls/FactPanel.qml +++ b/src/FactSystem/FactControls/FactPanel.qml @@ -12,7 +12,7 @@ /// @author Don Gagne import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 1532d83d3..4f4f032a8 100644 --- a/src/FactSystem/FactControls/FactTextField.qml +++ b/src/FactSystem/FactControls/FactTextField.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/FactSystem/FactSystemTest.qml b/src/FactSystem/FactSystemTest.qml index c76f3451f..6d35e3c65 100644 --- a/src/FactSystem/FactSystemTest.qml +++ b/src/FactSystem/FactSystemTest.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml b/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml index 16b514bba..feddf1c42 100644 --- a/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml +++ b/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml b/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml index 27056bdc0..21c0148e1 100644 --- a/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml +++ b/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 diff --git a/src/FirmwarePlugin/NoGeoFenceEditor.qml b/src/FirmwarePlugin/NoGeoFenceEditor.qml index 6dc61fc50..e6a2b99d4 100644 --- a/src/FirmwarePlugin/NoGeoFenceEditor.qml +++ b/src/FirmwarePlugin/NoGeoFenceEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml b/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml index 2a1332bc4..f8670dbe5 100644 --- a/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml +++ b/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index cee8e85e2..c099bddea 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtLocation 5.6 diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml index cca8ed21c..fed9d4238 100644 --- a/src/FlightDisplay/FlightDisplayViewMap.qml +++ b/src/FlightDisplay/FlightDisplayViewMap.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtLocation 5.6 import QtPositioning 5.5 diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml index 8c1095f3a..454360ba0 100644 --- a/src/FlightDisplay/FlightDisplayViewVideo.qml +++ b/src/FlightDisplay/FlightDisplayViewVideo.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.FlightDisplay 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index c06ac10fd..8fe27486d 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtLocation 5.6 diff --git a/src/FlightDisplay/MultiVehicleList.qml b/src/FlightDisplay/MultiVehicleList.qml index a7a4751e9..15cb3f9e1 100644 --- a/src/FlightDisplay/MultiVehicleList.qml +++ b/src/FlightDisplay/MultiVehicleList.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml index 20badb475..3192baeff 100644 --- a/src/FlightMap/FlightMap.qml +++ b/src/FlightMap/FlightMap.qml @@ -15,7 +15,7 @@ */ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtLocation 5.6 import QtPositioning 5.5 diff --git a/src/FlightMap/MapItems/MissionItemView.qml b/src/FlightMap/MapItems/MissionItemView.qml index 17403f8da..fa0a8810c 100644 --- a/src/FlightMap/MapItems/MissionItemView.qml +++ b/src/FlightMap/MapItems/MissionItemView.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtLocation 5.6 import QtPositioning 5.5 diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml index f4c18618a..46ad0f33f 100644 --- a/src/FlightMap/MapScale.qml +++ b/src/FlightMap/MapScale.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/QGCVideoBackground.qml b/src/FlightMap/QGCVideoBackground.qml index e0793e3e5..ba1ee9f08 100644 --- a/src/FlightMap/QGCVideoBackground.qml +++ b/src/FlightMap/QGCVideoBackground.qml @@ -15,7 +15,7 @@ */ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.QgcQtGStreamer 1.0 VideoItem { diff --git a/src/FlightMap/Widgets/CenterMapDropButton.qml b/src/FlightMap/Widgets/CenterMapDropButton.qml index c15da9af9..67c8bb0ee 100644 --- a/src/FlightMap/Widgets/CenterMapDropButton.qml +++ b/src/FlightMap/Widgets/CenterMapDropButton.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QtPositioning 5.5 diff --git a/src/FlightMap/Widgets/CenterMapDropPanel.qml b/src/FlightMap/Widgets/CenterMapDropPanel.qml index 1c67cf73a..ac14217b6 100644 --- a/src/FlightMap/Widgets/CenterMapDropPanel.qml +++ b/src/FlightMap/Widgets/CenterMapDropPanel.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QtPositioning 5.5 diff --git a/src/FlightMap/Widgets/InstrumentSwipeView.qml b/src/FlightMap/Widgets/InstrumentSwipeView.qml index 973a33f2e..cea7f46a0 100644 --- a/src/FlightMap/Widgets/InstrumentSwipeView.qml +++ b/src/FlightMap/Widgets/InstrumentSwipeView.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl.Palette 1.0 diff --git a/src/FlightMap/Widgets/VibrationWidget.qml b/src/FlightMap/Widgets/VibrationWidget.qml index 54d7f65fb..b24132ebc 100644 --- a/src/FlightMap/Widgets/VibrationWidget.qml +++ b/src/FlightMap/Widgets/VibrationWidget.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/FWLandingPatternEditor.qml b/src/MissionEditor/FWLandingPatternEditor.qml index b715b5a9d..2fbdf0982 100644 --- a/src/MissionEditor/FWLandingPatternEditor.qml +++ b/src/MissionEditor/FWLandingPatternEditor.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/MissionEditor/FWLandingPatternMapVisual.qml b/src/MissionEditor/FWLandingPatternMapVisual.qml index 14ef06540..681a51e18 100644 --- a/src/MissionEditor/FWLandingPatternMapVisual.qml +++ b/src/MissionEditor/FWLandingPatternMapVisual.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtLocation 5.6 import QtPositioning 5.5 diff --git a/src/MissionEditor/GeoFenceEditor.qml b/src/MissionEditor/GeoFenceEditor.qml index 8de6cf2d1..e430dd5db 100644 --- a/src/MissionEditor/GeoFenceEditor.qml +++ b/src/MissionEditor/GeoFenceEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index 3291aff4b..1e6a24939 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtLocation 5.6 import QtPositioning 5.5 diff --git a/src/MissionEditor/MissionItemEditor.qml b/src/MissionEditor/MissionItemEditor.qml index d9c1916b7..913a85ae1 100644 --- a/src/MissionEditor/MissionItemEditor.qml +++ b/src/MissionEditor/MissionItemEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/MissionEditor/MissionItemMapVisual.qml b/src/MissionEditor/MissionItemMapVisual.qml index 568386234..0508eb757 100644 --- a/src/MissionEditor/MissionItemMapVisual.qml +++ b/src/MissionEditor/MissionItemMapVisual.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtLocation 5.6 import QtPositioning 5.5 diff --git a/src/MissionEditor/MissionItemStatus.qml b/src/MissionEditor/MissionItemStatus.qml index 112aad827..9c508cec6 100644 --- a/src/MissionEditor/MissionItemStatus.qml +++ b/src/MissionEditor/MissionItemStatus.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/MissionSettingsEditor.qml b/src/MissionEditor/MissionSettingsEditor.qml index 2ab6c3671..337927a24 100644 --- a/src/MissionEditor/MissionSettingsEditor.qml +++ b/src/MissionEditor/MissionSettingsEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 diff --git a/src/MissionEditor/QGCMapPolygonControls.qml b/src/MissionEditor/QGCMapPolygonControls.qml index 20a84b5ca..11d6a70ab 100644 --- a/src/MissionEditor/QGCMapPolygonControls.qml +++ b/src/MissionEditor/QGCMapPolygonControls.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 diff --git a/src/MissionEditor/RallyPointEditorHeader.qml b/src/MissionEditor/RallyPointEditorHeader.qml index d635068c4..1f45d9fee 100644 --- a/src/MissionEditor/RallyPointEditorHeader.qml +++ b/src/MissionEditor/RallyPointEditorHeader.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/RallyPointItemEditor.qml b/src/MissionEditor/RallyPointItemEditor.qml index 690abaedb..ff3805a5b 100644 --- a/src/MissionEditor/RallyPointItemEditor.qml +++ b/src/MissionEditor/RallyPointItemEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/SimpleItemEditor.qml b/src/MissionEditor/SimpleItemEditor.qml index bd73164aa..b4aa79b79 100644 --- a/src/MissionEditor/SimpleItemEditor.qml +++ b/src/MissionEditor/SimpleItemEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/MissionEditor/SimpleItemMapVisual.qml b/src/MissionEditor/SimpleItemMapVisual.qml index 1b2f52c68..0c5708e67 100644 --- a/src/MissionEditor/SimpleItemMapVisual.qml +++ b/src/MissionEditor/SimpleItemMapVisual.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtLocation 5.6 import QtPositioning 5.5 diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml index 7256fa734..0d84de917 100644 --- a/src/MissionEditor/SurveyItemEditor.qml +++ b/src/MissionEditor/SurveyItemEditor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/MissionEditor/SurveyMapVisual.qml b/src/MissionEditor/SurveyMapVisual.qml index 813c147da..cfbdb092c 100644 --- a/src/MissionEditor/SurveyMapVisual.qml +++ b/src/MissionEditor/SurveyMapVisual.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtLocation 5.6 import QtPositioning 5.5 diff --git a/src/MultiVehicle/MultiVehicleView.qml b/src/MultiVehicle/MultiVehicleView.qml index c25a95512..c7125ffcb 100644 --- a/src/MultiVehicle/MultiVehicleView.qml +++ b/src/MultiVehicle/MultiVehicleView.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml index cf3e590c3..4b2d62a19 100644 --- a/src/QmlControls/AppMessages.qml +++ b/src/QmlControls/AppMessages.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/QmlControls/ClickableColor.qml b/src/QmlControls/ClickableColor.qml index 48a3eb72e..52fc16acc 100644 --- a/src/QmlControls/ClickableColor.qml +++ b/src/QmlControls/ClickableColor.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 Rectangle { diff --git a/src/QmlControls/DropButton.qml b/src/QmlControls/DropButton.qml index 91241b11f..e5f79dbb3 100644 --- a/src/QmlControls/DropButton.qml +++ b/src/QmlControls/DropButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl 1.0 diff --git a/src/QmlControls/DropPanel.qml b/src/QmlControls/DropPanel.qml index b71299b61..7c606cf35 100644 --- a/src/QmlControls/DropPanel.qml +++ b/src/QmlControls/DropPanel.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl 1.0 diff --git a/src/QmlControls/ExclusiveGroupItem.qml b/src/QmlControls/ExclusiveGroupItem.qml index 37d6727e0..1e7ade2e4 100644 --- a/src/QmlControls/ExclusiveGroupItem.qml +++ b/src/QmlControls/ExclusiveGroupItem.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 /// 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 ceb583f8c..fd9259f78 100644 --- a/src/QmlControls/FactSliderPanel.qml +++ b/src/QmlControls/FactSliderPanel.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/QmlControls/FlightModeMenu.qml b/src/QmlControls/FlightModeMenu.qml index 81b28db38..35ad1c506 100644 --- a/src/QmlControls/FlightModeMenu.qml +++ b/src/QmlControls/FlightModeMenu.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/IndicatorButton.qml b/src/QmlControls/IndicatorButton.qml index e3f718db8..df924f648 100644 --- a/src/QmlControls/IndicatorButton.qml +++ b/src/QmlControls/IndicatorButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/JoystickThumbPad.qml b/src/QmlControls/JoystickThumbPad.qml index 50761b094..90e954f0b 100644 --- a/src/QmlControls/JoystickThumbPad.qml +++ b/src/QmlControls/JoystickThumbPad.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/MissionCommandDialog.qml b/src/QmlControls/MissionCommandDialog.qml index d031290f2..b0a73ee83 100644 --- a/src/QmlControls/MissionCommandDialog.qml +++ b/src/QmlControls/MissionCommandDialog.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/MissionItemIndexLabel.qml b/src/QmlControls/MissionItemIndexLabel.qml index b51c0718e..746d14d6c 100644 --- a/src/QmlControls/MissionItemIndexLabel.qml +++ b/src/QmlControls/MissionItemIndexLabel.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ModeSwitchDisplay.qml b/src/QmlControls/ModeSwitchDisplay.qml index 2c5a350f5..0322c6ac3 100644 --- a/src/QmlControls/ModeSwitchDisplay.qml +++ b/src/QmlControls/ModeSwitchDisplay.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/OfflineMapButton.qml b/src/QmlControls/OfflineMapButton.qml index 3917ac966..63f391933 100644 --- a/src/QmlControls/OfflineMapButton.qml +++ b/src/QmlControls/OfflineMapButton.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 1a88af70f..1d1ed8d3c 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -12,7 +12,7 @@ /// @author Don Gagne import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml index c3bfba094..0614f1064 100644 --- a/src/QmlControls/ParameterEditorDialog.qml +++ b/src/QmlControls/ParameterEditorDialog.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index ab10c9f23..e00a4a672 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Private 1.0 diff --git a/src/QmlControls/QGCCheckBox.qml b/src/QmlControls/QGCCheckBox.qml index 143fca151..6628460e7 100644 --- a/src/QmlControls/QGCCheckBox.qml +++ b/src/QmlControls/QGCCheckBox.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCColoredImage.qml b/src/QmlControls/QGCColoredImage.qml index f5e4d5102..455f67c43 100644 --- a/src/QmlControls/QGCColoredImage.qml +++ b/src/QmlControls/QGCColoredImage.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.0 diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index 04455b25f..2383229c1 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Private 1.0 diff --git a/src/QmlControls/QGCGroupBox.qml b/src/QmlControls/QGCGroupBox.qml index 74c344c3c..b9570c5c3 100644 --- a/src/QmlControls/QGCGroupBox.qml +++ b/src/QmlControls/QGCGroupBox.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCLabel.qml b/src/QmlControls/QGCLabel.qml index 12b658c27..56b00aaed 100644 --- a/src/QmlControls/QGCLabel.qml +++ b/src/QmlControls/QGCLabel.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCMapLabel.qml b/src/QmlControls/QGCMapLabel.qml index 5c9e3d497..8f243f1d7 100644 --- a/src/QmlControls/QGCMapLabel.qml +++ b/src/QmlControls/QGCMapLabel.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCMobileFileOpenDialog.qml b/src/QmlControls/QGCMobileFileOpenDialog.qml index dd61da48b..a2d9b0f69 100644 --- a/src/QmlControls/QGCMobileFileOpenDialog.qml +++ b/src/QmlControls/QGCMobileFileOpenDialog.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/QGCMobileFileSaveDialog.qml b/src/QmlControls/QGCMobileFileSaveDialog.qml index c1a3361a6..654a35443 100644 --- a/src/QmlControls/QGCMobileFileSaveDialog.qml +++ b/src/QmlControls/QGCMobileFileSaveDialog.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/QGCMovableItem.qml b/src/QmlControls/QGCMovableItem.qml index 6ab616e5d..8f683ae51 100644 --- a/src/QmlControls/QGCMovableItem.qml +++ b/src/QmlControls/QGCMovableItem.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 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 4e1095c53..a8d716156 100644 --- a/src/QmlControls/QGCPipable.qml +++ b/src/QmlControls/QGCPipable.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCRadioButton.qml b/src/QmlControls/QGCRadioButton.qml index 7d49e9c13..82578fac4 100644 --- a/src/QmlControls/QGCRadioButton.qml +++ b/src/QmlControls/QGCRadioButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCSlider.qml b/src/QmlControls/QGCSlider.qml index 0aaee7d5a..10a7ff697 100644 --- a/src/QmlControls/QGCSlider.qml +++ b/src/QmlControls/QGCSlider.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Private 1.0 diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index db6698c8a..540e8fd54 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 diff --git a/src/QmlControls/QGCToolBarButton.qml b/src/QmlControls/QGCToolBarButton.qml index 5c392ebf9..ad3dbee22 100644 --- a/src/QmlControls/QGCToolBarButton.qml +++ b/src/QmlControls/QGCToolBarButton.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCView.qml b/src/QmlControls/QGCView.qml index 4f4b98e92..e83b042c1 100644 --- a/src/QmlControls/QGCView.qml +++ b/src/QmlControls/QGCView.qml @@ -12,7 +12,7 @@ /// @author Don Gagne import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QGCViewDialog.qml b/src/QmlControls/QGCViewDialog.qml index 71bb51f12..2af33e4ae 100644 --- a/src/QmlControls/QGCViewDialog.qml +++ b/src/QmlControls/QGCViewDialog.qml @@ -12,7 +12,7 @@ /// @author Don Gagne import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCViewMessage.qml b/src/QmlControls/QGCViewMessage.qml index c2b426932..0e9ae00c5 100644 --- a/src/QmlControls/QGCViewMessage.qml +++ b/src/QmlControls/QGCViewMessage.qml @@ -12,7 +12,7 @@ /// @author Don Gagne import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCViewPanel.qml b/src/QmlControls/QGCViewPanel.qml index c0f3b18cd..51eb109a6 100644 --- a/src/QmlControls/QGCViewPanel.qml +++ b/src/QmlControls/QGCViewPanel.qml @@ -12,7 +12,7 @@ /// @author Don Gagne import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Palette 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QmlTest.qml b/src/QmlControls/QmlTest.qml index 970d52136..9970976bb 100644 --- a/src/QmlControls/QmlTest.qml +++ b/src/QmlControls/QmlTest.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/RCChannelMonitor.qml b/src/QmlControls/RCChannelMonitor.qml index f647c72a0..72f796173 100644 --- a/src/QmlControls/RCChannelMonitor.qml +++ b/src/QmlControls/RCChannelMonitor.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/RoundButton.qml b/src/QmlControls/RoundButton.qml index c93a03b1f..25131881e 100644 --- a/src/QmlControls/RoundButton.qml +++ b/src/QmlControls/RoundButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index 3802a60e9..4147df265 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/src/QmlControls/ScreenTools.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Window 2.2 import QGroundControl 1.0 diff --git a/src/QmlControls/SliderSwitch.qml b/src/QmlControls/SliderSwitch.qml index e62b46105..0d6d59d25 100644 --- a/src/QmlControls/SliderSwitch.qml +++ b/src/QmlControls/SliderSwitch.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml index 4239566a1..47211badf 100644 --- a/src/QmlControls/SubMenuButton.qml +++ b/src/QmlControls/SubMenuButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.0 diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml index b7842facd..dbd5e98ea 100644 --- a/src/QmlControls/ToolStrip.qml +++ b/src/QmlControls/ToolStrip.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/VehicleRotationCal.qml b/src/QmlControls/VehicleRotationCal.qml index 106a0951c..350fd5ee3 100644 --- a/src/QmlControls/VehicleRotationCal.qml +++ b/src/QmlControls/VehicleRotationCal.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/VehicleSummaryRow.qml b/src/QmlControls/VehicleSummaryRow.qml index 7ccbf72ab..0e0e29078 100644 --- a/src/QmlControls/VehicleSummaryRow.qml +++ b/src/QmlControls/VehicleSummaryRow.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 Row { diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index 8a90de360..808ba02b4 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index 22337a10e..372fff58d 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index e2c4945b6..30234cd7d 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/VehicleSetup/PX4FlowSensor.qml b/src/VehicleSetup/PX4FlowSensor.qml index d9e951246..a28962dd6 100644 --- a/src/VehicleSetup/PX4FlowSensor.qml +++ b/src/VehicleSetup/PX4FlowSensor.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/VehicleSetup/SetupParameterEditor.qml b/src/VehicleSetup/SetupParameterEditor.qml index 38bc6360c..bd1bdafa1 100644 --- a/src/VehicleSetup/SetupParameterEditor.qml +++ b/src/VehicleSetup/SetupParameterEditor.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml index 86f5cd094..5ca18bb53 100644 --- a/src/VehicleSetup/SetupView.qml +++ b/src/VehicleSetup/SetupView.qml @@ -13,7 +13,7 @@ /// @author Don Gagne import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.AutoPilotPlugin 1.0 diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index fe2a2c9e9..27b7eb7e8 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl 1.0 diff --git a/src/ViewWidgets/CustomCommandWidget.qml b/src/ViewWidgets/CustomCommandWidget.qml index c77dcc199..af49f6352 100644 --- a/src/ViewWidgets/CustomCommandWidget.qml +++ b/src/ViewWidgets/CustomCommandWidget.qml @@ -12,7 +12,7 @@ /// @author Don Gagne import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/ViewWidgets/ViewWidget.qml b/src/ViewWidgets/ViewWidget.qml index 680e50e62..16124cfa7 100644 --- a/src/ViewWidgets/ViewWidget.qml +++ b/src/ViewWidgets/ViewWidget.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 diff --git a/src/test.qml b/src/test.qml index c49d3fa14..017b53bff 100644 --- a/src/test.qml +++ b/src/test.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QGroundControl.FactControls 1.0 diff --git a/src/ui/AppSettings.qml b/src/ui/AppSettings.qml index c5b65cea0..505e7aae7 100644 --- a/src/ui/AppSettings.qml +++ b/src/ui/AppSettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtPositioning 5.5 import QGroundControl 1.0 diff --git a/src/ui/MainWindowHybrid.qml b/src/ui/MainWindowHybrid.qml index 01ac26a51..011412f91 100644 --- a/src/ui/MainWindowHybrid.qml +++ b/src/ui/MainWindowHybrid.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml index 1f5ea2835..2768a0af4 100644 --- a/src/ui/MainWindowInner.qml +++ b/src/ui/MainWindowInner.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtPositioning 5.5 diff --git a/src/ui/preferences/BluetoothSettings.qml b/src/ui/preferences/BluetoothSettings.qml index 122351e35..c111acbb2 100644 --- a/src/ui/preferences/BluetoothSettings.qml +++ b/src/ui/preferences/BluetoothSettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/DebugWindow.qml b/src/ui/preferences/DebugWindow.qml index 8c9d72ba8..3e8ddb6da 100644 --- a/src/ui/preferences/DebugWindow.qml +++ b/src/ui/preferences/DebugWindow.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index de7125f08..d80dc4439 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtMultimedia 5.8 diff --git a/src/ui/preferences/LinkSettings.qml b/src/ui/preferences/LinkSettings.qml index 47a2eeb88..cb0a234ab 100644 --- a/src/ui/preferences/LinkSettings.qml +++ b/src/ui/preferences/LinkSettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/LogReplaySettings.qml b/src/ui/preferences/LogReplaySettings.qml index 237d92451..511c8b431 100644 --- a/src/ui/preferences/LogReplaySettings.qml +++ b/src/ui/preferences/LogReplaySettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/MavlinkSettings.qml b/src/ui/preferences/MavlinkSettings.qml index d42191cda..f52ab0fee 100644 --- a/src/ui/preferences/MavlinkSettings.qml +++ b/src/ui/preferences/MavlinkSettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/ui/preferences/MockLinkSettings.qml b/src/ui/preferences/MockLinkSettings.qml index 28a1b47a9..47d6d35c8 100644 --- a/src/ui/preferences/MockLinkSettings.qml +++ b/src/ui/preferences/MockLinkSettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 diff --git a/src/ui/preferences/SerialSettings.qml b/src/ui/preferences/SerialSettings.qml index 8c00d7a25..afb319418 100644 --- a/src/ui/preferences/SerialSettings.qml +++ b/src/ui/preferences/SerialSettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/TcpSettings.qml b/src/ui/preferences/TcpSettings.qml index 14edee1ac..9b040b3ed 100644 --- a/src/ui/preferences/TcpSettings.qml +++ b/src/ui/preferences/TcpSettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/UdpSettings.qml b/src/ui/preferences/UdpSettings.qml index 5509b3208..5493031ea 100644 --- a/src/ui/preferences/UdpSettings.qml +++ b/src/ui/preferences/UdpSettings.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/toolbar/BatteryIndicator.qml b/src/ui/toolbar/BatteryIndicator.qml index 6ef0759a4..0a6242ab4 100644 --- a/src/ui/toolbar/BatteryIndicator.qml +++ b/src/ui/toolbar/BatteryIndicator.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 diff --git a/src/ui/toolbar/GPSIndicator.qml b/src/ui/toolbar/GPSIndicator.qml index 7bd148635..0920867fc 100644 --- a/src/ui/toolbar/GPSIndicator.qml +++ b/src/ui/toolbar/GPSIndicator.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index 4c31e0413..058699eb0 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml index 0ed1c1669..1a8c1e389 100644 --- a/src/ui/toolbar/MainToolBarIndicators.qml +++ b/src/ui/toolbar/MainToolBarIndicators.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 diff --git a/src/ui/toolbar/MessageIndicator.qml b/src/ui/toolbar/MessageIndicator.qml index fb8ab0a7c..186d059a7 100644 --- a/src/ui/toolbar/MessageIndicator.qml +++ b/src/ui/toolbar/MessageIndicator.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 diff --git a/src/ui/toolbar/ModeIndicator.qml b/src/ui/toolbar/ModeIndicator.qml index 92481387b..b86c2b4cf 100644 --- a/src/ui/toolbar/ModeIndicator.qml +++ b/src/ui/toolbar/ModeIndicator.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/RCRSSIIndicator.qml b/src/ui/toolbar/RCRSSIIndicator.qml index 0f5818ed9..bed0eddfd 100644 --- a/src/ui/toolbar/RCRSSIIndicator.qml +++ b/src/ui/toolbar/RCRSSIIndicator.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 diff --git a/src/ui/toolbar/TelemetryRSSIIndicator.qml b/src/ui/toolbar/TelemetryRSSIIndicator.qml index af6fa799b..bed7cd970 100644 --- a/src/ui/toolbar/TelemetryRSSIIndicator.qml +++ b/src/ui/toolbar/TelemetryRSSIIndicator.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QGroundControl 1.0 -- 2.22.0