From d4a7cd15461dd0e77df115a174f2387efcbcb526 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 2 Mar 2017 19:41:42 -0800 Subject: [PATCH] Update QtQuick and QtQuick.Control --- src/AnalyzeView/AnalyzePage.qml | 4 ++-- src/AnalyzeView/AnalyzeView.qml | 4 ++-- src/AnalyzeView/GeoTagPage.qml | 4 ++-- src/AnalyzeView/LogDownloadPage.qml | 4 ++-- src/AutoPilotPlugins/APM/APMAirframeComponent.qml | 4 ++-- src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMCameraComponent.qml | 4 ++-- src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMFlightModesComponent.qml | 4 ++-- src/AutoPilotPlugins/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 | 4 ++-- 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 ++-- src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml | 2 +- src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSensorsComponent.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSubFrameComponent.qml | 4 ++-- src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml | 4 ++-- src/AutoPilotPlugins/Common/ESP8266Component.qml | 4 ++-- src/AutoPilotPlugins/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 | 4 ++-- src/AutoPilotPlugins/PX4/CameraComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml | 4 ++-- src/AutoPilotPlugins/PX4/PX4FlightModes.qml | 4 ++-- 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 | 4 ++-- src/AutoPilotPlugins/PX4/PowerComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/PX4/SafetyComponent.qml | 4 ++-- src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/PX4/SensorsComponent.qml | 4 ++-- src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml | 4 ++-- src/AutoPilotPlugins/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 | 2 +- src/FactSystem/FactControls/FactTextFieldRow.qml | 2 +- src/FactSystem/FactSystemTest.qml | 4 ++-- src/FirmwarePlugin/APM/APMSensorParams.qml | 2 +- src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml | 4 ++-- src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml | 4 ++-- src/FirmwarePlugin/NoGeoFenceEditor.qml | 4 ++-- src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml | 4 ++-- src/FlightDisplay/FlightDisplayView.qml | 4 ++-- src/FlightDisplay/FlightDisplayViewDummy.qml | 2 +- src/FlightDisplay/FlightDisplayViewMap.qml | 4 ++-- src/FlightDisplay/FlightDisplayViewUVC.qml | 2 +- src/FlightDisplay/FlightDisplayViewVideo.qml | 4 ++-- src/FlightDisplay/FlightDisplayViewWidgets.qml | 4 ++-- src/FlightDisplay/MultiVehicleList.qml | 4 ++-- src/FlightDisplay/VirtualJoystick.qml | 2 +- src/FlightMap/FlightMap.qml | 4 ++-- src/FlightMap/MapItems/MissionItemIndicator.qml | 2 +- src/FlightMap/MapItems/MissionItemIndicatorDrag.qml | 2 +- src/FlightMap/MapItems/MissionItemView.qml | 4 ++-- src/FlightMap/MapItems/MissionLineView.qml | 2 +- src/FlightMap/MapItems/PolygonEditor.qml | 4 ++-- src/FlightMap/MapItems/VehicleMapItem.qml | 2 +- src/FlightMap/MapScale.qml | 4 ++-- src/FlightMap/QGCVideoBackground.qml | 4 ++-- src/FlightMap/Widgets/CameraWidget.qml | 2 +- src/FlightMap/Widgets/CenterMapDropButton.qml | 4 ++-- src/FlightMap/Widgets/CenterMapDropPanel.qml | 4 ++-- src/FlightMap/Widgets/InstrumentSwipeView.qml | 4 ++-- src/FlightMap/Widgets/MapFitFunctions.qml | 2 +- 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 | 2 +- src/FlightMap/Widgets/VehicleHealthWidget.qml | 2 +- src/FlightMap/Widgets/VibrationWidget.qml | 4 ++-- src/MissionEditor/FWLandingPatternEditor.qml | 4 ++-- src/MissionEditor/FWLandingPatternMapVisual.qml | 4 ++-- src/MissionEditor/GeoFenceEditor.qml | 4 ++-- src/MissionEditor/MissionEditor.qml | 4 ++-- src/MissionEditor/MissionItemEditor.qml | 4 ++-- src/MissionEditor/MissionItemMapVisual.qml | 4 ++-- src/MissionEditor/MissionItemStatus.qml | 4 ++-- src/MissionEditor/MissionSettingsEditor.qml | 4 ++-- src/MissionEditor/QGCMapPolygonControls.qml | 4 ++-- src/MissionEditor/RallyPointEditorHeader.qml | 4 ++-- src/MissionEditor/RallyPointItemEditor.qml | 4 ++-- src/MissionEditor/SimpleItemEditor.qml | 4 ++-- src/MissionEditor/SimpleItemMapVisual.qml | 4 ++-- src/MissionEditor/SurveyItemEditor.qml | 4 ++-- src/MissionEditor/SurveyMapVisual.qml | 4 ++-- src/MultiVehicle/MultiVehicleView.qml | 4 ++-- 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 | 4 ++-- 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 | 4 ++-- 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 | 4 ++-- 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 | 4 ++-- src/ui/MainWindowHybrid.qml | 4 ++-- src/ui/MainWindowInner.qml | 4 ++-- src/ui/MainWindowNative.qml | 2 +- src/ui/preferences/BluetoothSettings.qml | 4 ++-- src/ui/preferences/DebugWindow.qml | 4 ++-- src/ui/preferences/GeneralSettings.qml | 4 ++-- 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 | 4 ++-- src/ui/preferences/SerialSettings.qml | 4 ++-- src/ui/preferences/TcpSettings.qml | 4 ++-- src/ui/preferences/UdpSettings.qml | 4 ++-- src/ui/toolbar/BatteryIndicator.qml | 4 ++-- src/ui/toolbar/GPSIndicator.qml | 4 ++-- src/ui/toolbar/MainToolBar.qml | 4 ++-- src/ui/toolbar/MainToolBarIndicators.qml | 4 ++-- src/ui/toolbar/MessageIndicator.qml | 4 ++-- src/ui/toolbar/ModeIndicator.qml | 4 ++-- src/ui/toolbar/RCRSSIIndicator.qml | 4 ++-- src/ui/toolbar/SignalStrength.qml | 2 +- src/ui/toolbar/TelemetryRSSIIndicator.qml | 4 ++-- 200 files changed, 366 insertions(+), 366 deletions(-) diff --git a/src/AnalyzeView/AnalyzePage.qml b/src/AnalyzeView/AnalyzePage.qml index 36fc36048..9c656d46d 100644 --- a/src/AnalyzeView/AnalyzePage.qml +++ b/src/AnalyzeView/AnalyzePage.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AnalyzeView/AnalyzeView.qml b/src/AnalyzeView/AnalyzeView.qml index cd910754a..be374d623 100644 --- a/src/AnalyzeView/AnalyzeView.qml +++ b/src/AnalyzeView/AnalyzeView.qml @@ -12,8 +12,8 @@ /// @brief Setup View /// @author Don Gagne -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AnalyzeView/GeoTagPage.qml b/src/AnalyzeView/GeoTagPage.qml index a4881a7f8..2d4801de0 100644 --- a/src/AnalyzeView/GeoTagPage.qml +++ b/src/AnalyzeView/GeoTagPage.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AnalyzeView/LogDownloadPage.qml b/src/AnalyzeView/LogDownloadPage.qml index 8baf6532e..799d466c9 100644 --- a/src/AnalyzeView/LogDownloadPage.qml +++ b/src/AnalyzeView/LogDownloadPage.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml index bcf4cef90..e2bc32043 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml index 8ba3da326..3a19cfaf9 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 0eafaade9..7313a8678 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponent.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 92fc33afa..d2c43a14e 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 623be0903..4aa4dc78c 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 f0237a2e1..13764bba8 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 b2eac54bb..20e9ece4c 100644 --- a/src/AutoPilotPlugins/APM/APMLightsComponent.qml +++ b/src/AutoPilotPlugins/APM/APMLightsComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 7712df99c..14f2ce702 100644 --- a/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 c57eca946..7207f3cc2 100644 --- a/src/AutoPilotPlugins/APM/APMNotSupported.qml +++ b/src/AutoPilotPlugins/APM/APMNotSupported.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.qml b/src/AutoPilotPlugins/APM/APMPowerComponent.qml index 7cb5437a1..2e149f254 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml index 62d55dd30..150bbb104 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 93ed47622..fff1bd288 100644 --- a/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 3d2495395..0f40671ea 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml index 6b1515b38..ec555748b 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml index c57eca946..7207f3cc2 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml index 12f810322..d8b15d099 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml index 9e2a597a2..d2ddc72ce 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 ccb832be7..b6b3b4a0c 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 c57eca946..7207f3cc2 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml index 1ab63b7c4..fd8ee5ea6 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 1f328647e..ab8d61486 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml index 85bd33730..e569d8b10 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml index df06fec69..cf3fbd4b3 100644 --- a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml +++ b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 e2b33b2fa..a3f2534ba 100644 --- a/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 4547fbd3c..1b29887f1 100644 --- a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 dc439514d..48afba27a 100644 --- a/src/AutoPilotPlugins/Common/ESP8266Component.qml +++ b/src/AutoPilotPlugins/Common/ESP8266Component.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml index 3720a1e75..6643b26ac 100644 --- a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml +++ b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 84034427b..595fa1928 100644 --- a/src/AutoPilotPlugins/Common/MixersComponent.qml +++ b/src/AutoPilotPlugins/Common/MixersComponent.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 fd41c08a3..a32e20369 100644 --- a/src/AutoPilotPlugins/Common/MotorComponent.qml +++ b/src/AutoPilotPlugins/Common/MotorComponent.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/Common/RadioComponent.qml b/src/AutoPilotPlugins/Common/RadioComponent.qml index 2d4bd7fc6..fa3ea6ae8 100644 --- a/src/AutoPilotPlugins/Common/RadioComponent.qml +++ b/src/AutoPilotPlugins/Common/RadioComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/Common/SetupPage.qml b/src/AutoPilotPlugins/Common/SetupPage.qml index f59cd7dc0..802319849 100644 --- a/src/AutoPilotPlugins/Common/SetupPage.qml +++ b/src/AutoPilotPlugins/Common/SetupPage.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.qml b/src/AutoPilotPlugins/PX4/AirframeComponent.qml index 13a3f3b8f..092f5b301 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml index d95371ef3..206ee9b60 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 7b523f5a1..7f09b5f69 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponent.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Layouts 1.2 import QtGraphicalEffects 1.0 diff --git a/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml b/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml index 6ebc862a4..65d867787 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 b779080c0..ab8b06057 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 764685934..529b1eecb 100644 --- a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 diff --git a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml index dad5c931c..1ad3644ab 100644 --- a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml index 6704f871f..925c51032 100644 --- a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 5198684ce..31989f4a6 100644 --- a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 e2d484e1b..2985d71c0 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml index 4c1eed32a..f0c234d48 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml index e715c2a6c..02014fda8 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index 7d992a40f..3b26e047e 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml index eff4c101d..71fd74973 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.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 6532da76a..01e4b3a28 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Layouts 1.2 import QtGraphicalEffects 1.0 diff --git a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml index 9b6a2b13c..080592501 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 7a732d786..a3cbb16f4 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponent.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponent.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml index 606d94819..1f675ae2f 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml index 0f353ead6..b324e8d2d 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 b01ae793b..8f22d3ed5 100644 --- a/src/FactSystem/FactControls/FactBitmask.qml +++ b/src/FactSystem/FactControls/FactBitmask.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 f64d20041..375a8bf6a 100644 --- a/src/FactSystem/FactControls/FactCheckBox.qml +++ b/src/FactSystem/FactControls/FactCheckBox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/FactSystem/FactControls/FactComboBox.qml b/src/FactSystem/FactControls/FactComboBox.qml index d56bbf11f..947c5685d 100644 --- a/src/FactSystem/FactControls/FactComboBox.qml +++ b/src/FactSystem/FactControls/FactComboBox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/FactSystem/FactControls/FactLabel.qml b/src/FactSystem/FactControls/FactLabel.qml index 461794102..4f66c7aaf 100644 --- a/src/FactSystem/FactControls/FactLabel.qml +++ b/src/FactSystem/FactControls/FactLabel.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/FactSystem/FactControls/FactPanel.qml b/src/FactSystem/FactControls/FactPanel.qml index a5fb64b33..99e78f783 100644 --- a/src/FactSystem/FactControls/FactPanel.qml +++ b/src/FactSystem/FactControls/FactPanel.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.3 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 58a709360..9ba90647f 100644 --- a/src/FactSystem/FactControls/FactTextField.qml +++ b/src/FactSystem/FactControls/FactTextField.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 diff --git a/src/FactSystem/FactControls/FactTextFieldGrid.qml b/src/FactSystem/FactControls/FactTextFieldGrid.qml index 90097c731..9d1fea1a9 100644 --- a/src/FactSystem/FactControls/FactTextFieldGrid.qml +++ b/src/FactSystem/FactControls/FactTextFieldGrid.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.7 import QtQuick.Layouts 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/FactSystem/FactControls/FactTextFieldRow.qml b/src/FactSystem/FactControls/FactTextFieldRow.qml index 36ea7ca08..e01c50298 100644 --- a/src/FactSystem/FactControls/FactTextFieldRow.qml +++ b/src/FactSystem/FactControls/FactTextFieldRow.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.7 import QtQuick.Layouts 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/FactSystem/FactSystemTest.qml b/src/FactSystem/FactSystemTest.qml index 8ac4d9ada..c76f3451f 100644 --- a/src/FactSystem/FactSystemTest.qml +++ b/src/FactSystem/FactSystemTest.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 217ba564d..c3c62355a 100644 --- a/src/FirmwarePlugin/APM/APMSensorParams.qml +++ b/src/FirmwarePlugin/APM/APMSensorParams.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.7 import QGroundControl.FactSystem 1.0 diff --git a/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml b/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml index 480d3213d..16b514bba 100644 --- a/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml +++ b/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml b/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml index 39c41aafe..5188bbf8d 100644 --- a/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml +++ b/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/FirmwarePlugin/NoGeoFenceEditor.qml b/src/FirmwarePlugin/NoGeoFenceEditor.qml index 93138f1df..6dc61fc50 100644 --- a/src/FirmwarePlugin/NoGeoFenceEditor.qml +++ b/src/FirmwarePlugin/NoGeoFenceEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml b/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml index 441f26a48..2a1332bc4 100644 --- a/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml +++ b/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 07f4c6832..8e723d1ca 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 import QtLocation 5.3 diff --git a/src/FlightDisplay/FlightDisplayViewDummy.qml b/src/FlightDisplay/FlightDisplayViewDummy.qml index 286c32143..b53a99e3b 100644 --- a/src/FlightDisplay/FlightDisplayViewDummy.qml +++ b/src/FlightDisplay/FlightDisplayViewDummy.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 Rectangle { anchors.fill: parent diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml index 12c7b7fdc..0f771c55f 100644 --- a/src/FlightDisplay/FlightDisplayViewMap.qml +++ b/src/FlightDisplay/FlightDisplayViewMap.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtLocation 5.3 import QtPositioning 5.2 diff --git a/src/FlightDisplay/FlightDisplayViewUVC.qml b/src/FlightDisplay/FlightDisplayViewUVC.qml index f96083205..5791165ed 100644 --- a/src/FlightDisplay/FlightDisplayViewUVC.qml +++ b/src/FlightDisplay/FlightDisplayViewUVC.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtMultimedia 5.5 import QGroundControl 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml index b3ea10af4..8c1095f3a 100644 --- a/src/FlightDisplay/FlightDisplayViewVideo.qml +++ b/src/FlightDisplay/FlightDisplayViewVideo.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.FlightDisplay 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index fd553fde2..fa18ef552 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 import QtLocation 5.3 diff --git a/src/FlightDisplay/MultiVehicleList.qml b/src/FlightDisplay/MultiVehicleList.qml index a266bf0b6..e58a983a7 100644 --- a/src/FlightDisplay/MultiVehicleList.qml +++ b/src/FlightDisplay/MultiVehicleList.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/FlightDisplay/VirtualJoystick.qml b/src/FlightDisplay/VirtualJoystick.qml index f10d4e2d2..c5e4fa70d 100644 --- a/src/FlightDisplay/VirtualJoystick.qml +++ b/src/FlightDisplay/VirtualJoystick.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml index 894d1dde1..3d2c633de 100644 --- a/src/FlightMap/FlightMap.qml +++ b/src/FlightMap/FlightMap.qml @@ -14,8 +14,8 @@ * @author Gus Grubba */ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtLocation 5.3 import QtPositioning 5.3 diff --git a/src/FlightMap/MapItems/MissionItemIndicator.qml b/src/FlightMap/MapItems/MissionItemIndicator.qml index 58ad84543..114458d9f 100644 --- a/src/FlightMap/MapItems/MissionItemIndicator.qml +++ b/src/FlightMap/MapItems/MissionItemIndicator.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtLocation 5.3 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml index 345f78f94..00c106625 100644 --- a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml +++ b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtLocation 5.3 import QGroundControl 1.0 diff --git a/src/FlightMap/MapItems/MissionItemView.qml b/src/FlightMap/MapItems/MissionItemView.qml index 2065ca958..e879ef12b 100644 --- a/src/FlightMap/MapItems/MissionItemView.qml +++ b/src/FlightMap/MapItems/MissionItemView.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtLocation 5.3 import QtPositioning 5.3 diff --git a/src/FlightMap/MapItems/MissionLineView.qml b/src/FlightMap/MapItems/MissionLineView.qml index 9d7a3b709..432ce3f05 100644 --- a/src/FlightMap/MapItems/MissionLineView.qml +++ b/src/FlightMap/MapItems/MissionLineView.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtLocation 5.3 import QtPositioning 5.3 diff --git a/src/FlightMap/MapItems/PolygonEditor.qml b/src/FlightMap/MapItems/PolygonEditor.qml index 15fa0d20d..8b1c5341b 100644 --- a/src/FlightMap/MapItems/PolygonEditor.qml +++ b/src/FlightMap/MapItems/PolygonEditor.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtLocation 5.3 import QGroundControl 1.0 @@ -69,7 +69,7 @@ Item { adjustingPolygon = true for (var i=0; i -import QtQuick 2.4 +import QtQuick 2.7 import QtLocation 5.3 import QtPositioning 5.3 diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml index 8a265d863..f4c18618a 100644 --- a/src/FlightMap/MapScale.qml +++ b/src/FlightMap/MapScale.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/QGCVideoBackground.qml b/src/FlightMap/QGCVideoBackground.qml index 4a99d6da3..e0793e3e5 100644 --- a/src/FlightMap/QGCVideoBackground.qml +++ b/src/FlightMap/QGCVideoBackground.qml @@ -14,8 +14,8 @@ * @author Gus Grubba */ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.QgcQtGStreamer 1.0 VideoItem { diff --git a/src/FlightMap/Widgets/CameraWidget.qml b/src/FlightMap/Widgets/CameraWidget.qml index 8e0ec95ce..80009af20 100644 --- a/src/FlightMap/Widgets/CameraWidget.qml +++ b/src/FlightMap/Widgets/CameraWidget.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/FlightMap/Widgets/CenterMapDropButton.qml b/src/FlightMap/Widgets/CenterMapDropButton.qml index 9fb58839e..6571b057f 100644 --- a/src/FlightMap/Widgets/CenterMapDropButton.qml +++ b/src/FlightMap/Widgets/CenterMapDropButton.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QtPositioning 5.3 diff --git a/src/FlightMap/Widgets/CenterMapDropPanel.qml b/src/FlightMap/Widgets/CenterMapDropPanel.qml index a8adffc0c..12dac2121 100644 --- a/src/FlightMap/Widgets/CenterMapDropPanel.qml +++ b/src/FlightMap/Widgets/CenterMapDropPanel.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QtPositioning 5.3 diff --git a/src/FlightMap/Widgets/InstrumentSwipeView.qml b/src/FlightMap/Widgets/InstrumentSwipeView.qml index 22ec90583..973a33f2e 100644 --- a/src/FlightMap/Widgets/InstrumentSwipeView.qml +++ b/src/FlightMap/Widgets/InstrumentSwipeView.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import QGroundControl.Palette 1.0 diff --git a/src/FlightMap/Widgets/MapFitFunctions.qml b/src/FlightMap/Widgets/MapFitFunctions.qml index dc76a54fe..4f985f015 100644 --- a/src/FlightMap/Widgets/MapFitFunctions.qml +++ b/src/FlightMap/Widgets/MapFitFunctions.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtPositioning 5.3 import QGroundControl 1.0 diff --git a/src/FlightMap/Widgets/QGCArtificialHorizon.qml b/src/FlightMap/Widgets/QGCArtificialHorizon.qml index 73f876536..f37dd0cff 100644 --- a/src/FlightMap/Widgets/QGCArtificialHorizon.qml +++ b/src/FlightMap/Widgets/QGCArtificialHorizon.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.4 +import QtQuick 2.7 Item { id: root diff --git a/src/FlightMap/Widgets/QGCAttitudeHUD.qml b/src/FlightMap/Widgets/QGCAttitudeHUD.qml index f22cd54e3..ac11eb010 100644 --- a/src/FlightMap/Widgets/QGCAttitudeHUD.qml +++ b/src/FlightMap/Widgets/QGCAttitudeHUD.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.4 +import QtQuick 2.7 import QGroundControl.ScreenTools 1.0 Item { diff --git a/src/FlightMap/Widgets/QGCAttitudeWidget.qml b/src/FlightMap/Widgets/QGCAttitudeWidget.qml index b3358db3d..9c8619af7 100644 --- a/src/FlightMap/Widgets/QGCAttitudeWidget.qml +++ b/src/FlightMap/Widgets/QGCAttitudeWidget.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.4 +import QtQuick 2.7 import QtGraphicalEffects 1.0 import QGroundControl 1.0 diff --git a/src/FlightMap/Widgets/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml index a8e107180..484789a3f 100644 --- a/src/FlightMap/Widgets/QGCCompassWidget.qml +++ b/src/FlightMap/Widgets/QGCCompassWidget.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.4 +import QtQuick 2.7 import QtGraphicalEffects 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/QGCInstrumentWidget.qml b/src/FlightMap/Widgets/QGCInstrumentWidget.qml index a5b81c55a..a8d36f39e 100644 --- a/src/FlightMap/Widgets/QGCInstrumentWidget.qml +++ b/src/FlightMap/Widgets/QGCInstrumentWidget.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.4 +import QtQuick 2.7 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml b/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml index 03d5e34f3..dec886337 100644 --- a/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml +++ b/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/QGCPitchIndicator.qml b/src/FlightMap/Widgets/QGCPitchIndicator.qml index 594aa5ac9..c7ca4c81c 100644 --- a/src/FlightMap/Widgets/QGCPitchIndicator.qml +++ b/src/FlightMap/Widgets/QGCPitchIndicator.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.1 +import QtQuick 2.7 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 622921949..c7ec2e4bc 100644 --- a/src/FlightMap/Widgets/ValuesWidget.qml +++ b/src/FlightMap/Widgets/ValuesWidget.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/FlightMap/Widgets/VehicleHealthWidget.qml b/src/FlightMap/Widgets/VehicleHealthWidget.qml index b1c73ae9d..25e98cd19 100644 --- a/src/FlightMap/Widgets/VehicleHealthWidget.qml +++ b/src/FlightMap/Widgets/VehicleHealthWidget.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/FlightMap/Widgets/VibrationWidget.qml b/src/FlightMap/Widgets/VibrationWidget.qml index 0a7cb0087..54d7f65fb 100644 --- a/src/FlightMap/Widgets/VibrationWidget.qml +++ b/src/FlightMap/Widgets/VibrationWidget.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/FWLandingPatternEditor.qml b/src/MissionEditor/FWLandingPatternEditor.qml index 8d26b50b1..73e49e191 100644 --- a/src/MissionEditor/FWLandingPatternEditor.qml +++ b/src/MissionEditor/FWLandingPatternEditor.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/MissionEditor/FWLandingPatternMapVisual.qml b/src/MissionEditor/FWLandingPatternMapVisual.qml index 81fd35e7f..8aa9b1ed6 100644 --- a/src/MissionEditor/FWLandingPatternMapVisual.qml +++ b/src/MissionEditor/FWLandingPatternMapVisual.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtLocation 5.3 import QtPositioning 5.2 diff --git a/src/MissionEditor/GeoFenceEditor.qml b/src/MissionEditor/GeoFenceEditor.qml index 0d0d38eba..8de6cf2d1 100644 --- a/src/MissionEditor/GeoFenceEditor.qml +++ b/src/MissionEditor/GeoFenceEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index 7f3c76417..7f61bbc5a 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtLocation 5.3 import QtPositioning 5.3 diff --git a/src/MissionEditor/MissionItemEditor.qml b/src/MissionEditor/MissionItemEditor.qml index 156345685..12275f506 100644 --- a/src/MissionEditor/MissionItemEditor.qml +++ b/src/MissionEditor/MissionItemEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 diff --git a/src/MissionEditor/MissionItemMapVisual.qml b/src/MissionEditor/MissionItemMapVisual.qml index 585d159ce..71135759a 100644 --- a/src/MissionEditor/MissionItemMapVisual.qml +++ b/src/MissionEditor/MissionItemMapVisual.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtLocation 5.3 import QtPositioning 5.2 diff --git a/src/MissionEditor/MissionItemStatus.qml b/src/MissionEditor/MissionItemStatus.qml index 2aad79b34..27aa141dc 100644 --- a/src/MissionEditor/MissionItemStatus.qml +++ b/src/MissionEditor/MissionItemStatus.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/MissionSettingsEditor.qml b/src/MissionEditor/MissionSettingsEditor.qml index b209b6e11..e1fe3d5f3 100644 --- a/src/MissionEditor/MissionSettingsEditor.qml +++ b/src/MissionEditor/MissionSettingsEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/MissionEditor/QGCMapPolygonControls.qml b/src/MissionEditor/QGCMapPolygonControls.qml index 01f520e39..20a84b5ca 100644 --- a/src/MissionEditor/QGCMapPolygonControls.qml +++ b/src/MissionEditor/QGCMapPolygonControls.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 diff --git a/src/MissionEditor/RallyPointEditorHeader.qml b/src/MissionEditor/RallyPointEditorHeader.qml index ada44fc27..d635068c4 100644 --- a/src/MissionEditor/RallyPointEditorHeader.qml +++ b/src/MissionEditor/RallyPointEditorHeader.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/RallyPointItemEditor.qml b/src/MissionEditor/RallyPointItemEditor.qml index 6d02d0075..85fc002e9 100644 --- a/src/MissionEditor/RallyPointItemEditor.qml +++ b/src/MissionEditor/RallyPointItemEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/SimpleItemEditor.qml b/src/MissionEditor/SimpleItemEditor.qml index 677656d76..8a7069944 100644 --- a/src/MissionEditor/SimpleItemEditor.qml +++ b/src/MissionEditor/SimpleItemEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/MissionEditor/SimpleItemMapVisual.qml b/src/MissionEditor/SimpleItemMapVisual.qml index 7146ecc0d..8522362bc 100644 --- a/src/MissionEditor/SimpleItemMapVisual.qml +++ b/src/MissionEditor/SimpleItemMapVisual.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtLocation 5.3 import QtPositioning 5.2 diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml index 0117c4221..6f1e1446c 100644 --- a/src/MissionEditor/SurveyItemEditor.qml +++ b/src/MissionEditor/SurveyItemEditor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/MissionEditor/SurveyMapVisual.qml b/src/MissionEditor/SurveyMapVisual.qml index a438fb707..393affcaa 100644 --- a/src/MissionEditor/SurveyMapVisual.qml +++ b/src/MissionEditor/SurveyMapVisual.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtLocation 5.3 import QtPositioning 5.2 diff --git a/src/MultiVehicle/MultiVehicleView.qml b/src/MultiVehicle/MultiVehicleView.qml index 2aa15bf61..a5bbdb5a2 100644 --- a/src/MultiVehicle/MultiVehicleView.qml +++ b/src/MultiVehicle/MultiVehicleView.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml index de919c551..f62275a13 100644 --- a/src/QmlControls/AppMessages.qml +++ b/src/QmlControls/AppMessages.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 diff --git a/src/QmlControls/ClickableColor.qml b/src/QmlControls/ClickableColor.qml index 28c7e5744..48a3eb72e 100644 --- a/src/QmlControls/ClickableColor.qml +++ b/src/QmlControls/ClickableColor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 Rectangle { diff --git a/src/QmlControls/DropButton.qml b/src/QmlControls/DropButton.qml index b8deec86f..821e157d7 100644 --- a/src/QmlControls/DropButton.qml +++ b/src/QmlControls/DropButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.4 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/DropPanel.qml b/src/QmlControls/DropPanel.qml index 68303bb3b..6ac7b6bfc 100644 --- a/src/QmlControls/DropPanel.qml +++ b/src/QmlControls/DropPanel.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/ExclusiveGroupItem.qml b/src/QmlControls/ExclusiveGroupItem.qml index d37546c5c..37d6727e0 100644 --- a/src/QmlControls/ExclusiveGroupItem.qml +++ b/src/QmlControls/ExclusiveGroupItem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.4 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 /// 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 2d1fc417e..ceb583f8c 100644 --- a/src/QmlControls/FactSliderPanel.qml +++ b/src/QmlControls/FactSliderPanel.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/QmlControls/FlightModeDropdown.qml b/src/QmlControls/FlightModeDropdown.qml index 805438606..d32823eda 100644 --- a/src/QmlControls/FlightModeDropdown.qml +++ b/src/QmlControls/FlightModeDropdown.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/FlightModeMenu.qml b/src/QmlControls/FlightModeMenu.qml index 2f7794913..81b28db38 100644 --- a/src/QmlControls/FlightModeMenu.qml +++ b/src/QmlControls/FlightModeMenu.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/GuidedBar.qml b/src/QmlControls/GuidedBar.qml index 66705d516..8cad2aad1 100644 --- a/src/QmlControls/GuidedBar.qml +++ b/src/QmlControls/GuidedBar.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/IndicatorButton.qml b/src/QmlControls/IndicatorButton.qml index 40d8a2ce4..e3f718db8 100644 --- a/src/QmlControls/IndicatorButton.qml +++ b/src/QmlControls/IndicatorButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/JoystickThumbPad.qml b/src/QmlControls/JoystickThumbPad.qml index 7039492f0..50761b094 100644 --- a/src/QmlControls/JoystickThumbPad.qml +++ b/src/QmlControls/JoystickThumbPad.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/MissionCommandDialog.qml b/src/QmlControls/MissionCommandDialog.qml index 1a8503ecf..d031290f2 100644 --- a/src/QmlControls/MissionCommandDialog.qml +++ b/src/QmlControls/MissionCommandDialog.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/MissionItemIndexLabel.qml b/src/QmlControls/MissionItemIndexLabel.qml index 2dbf5bbed..f2dc80e04 100644 --- a/src/QmlControls/MissionItemIndexLabel.qml +++ b/src/QmlControls/MissionItemIndexLabel.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ModeSwitchDisplay.qml b/src/QmlControls/ModeSwitchDisplay.qml index de4c4a093..141ec38da 100644 --- a/src/QmlControls/ModeSwitchDisplay.qml +++ b/src/QmlControls/ModeSwitchDisplay.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/MultiRotorMotorDisplay.qml b/src/QmlControls/MultiRotorMotorDisplay.qml index 2034e9806..cec564612 100644 --- a/src/QmlControls/MultiRotorMotorDisplay.qml +++ b/src/QmlControls/MultiRotorMotorDisplay.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.7 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/OfflineMapButton.qml b/src/QmlControls/OfflineMapButton.qml index 8bfa2704f..3917ac966 100644 --- a/src/QmlControls/OfflineMapButton.qml +++ b/src/QmlControls/OfflineMapButton.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 61621b69e..1a88af70f 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.5 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml index 41b8966e3..3cc46a0d6 100644 --- a/src/QmlControls/ParameterEditorDialog.qml +++ b/src/QmlControls/ParameterEditorDialog.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index 55fe10af6..c8a3353f8 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Private 1.0 diff --git a/src/QmlControls/QGCCheckBox.qml b/src/QmlControls/QGCCheckBox.qml index 7cf0c4bc6..fd828a164 100644 --- a/src/QmlControls/QGCCheckBox.qml +++ b/src/QmlControls/QGCCheckBox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCColoredImage.qml b/src/QmlControls/QGCColoredImage.qml index 84e377f93..0b2074813 100644 --- a/src/QmlControls/QGCColoredImage.qml +++ b/src/QmlControls/QGCColoredImage.qml @@ -1,5 +1,5 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtGraphicalEffects 1.0 diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index 1a7402167..653f6649e 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Private 1.0 diff --git a/src/QmlControls/QGCFlickable.qml b/src/QmlControls/QGCFlickable.qml index c3a7dfdd5..b7ed79d53 100644 --- a/src/QmlControls/QGCFlickable.qml +++ b/src/QmlControls/QGCFlickable.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.7 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCFlickableHorizontalIndicator.qml b/src/QmlControls/QGCFlickableHorizontalIndicator.qml index e5a4fc429..35b05c28b 100644 --- a/src/QmlControls/QGCFlickableHorizontalIndicator.qml +++ b/src/QmlControls/QGCFlickableHorizontalIndicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.7 Rectangle { id: horizontalIndicator diff --git a/src/QmlControls/QGCFlickableVerticalIndicator.qml b/src/QmlControls/QGCFlickableVerticalIndicator.qml index c20a83286..4365d1bd6 100644 --- a/src/QmlControls/QGCFlickableVerticalIndicator.qml +++ b/src/QmlControls/QGCFlickableVerticalIndicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.7 Rectangle { id: verticalIndicator diff --git a/src/QmlControls/QGCGroupBox.qml b/src/QmlControls/QGCGroupBox.qml index 60217970c..74c344c3c 100644 --- a/src/QmlControls/QGCGroupBox.qml +++ b/src/QmlControls/QGCGroupBox.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 2.0 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCLabel.qml b/src/QmlControls/QGCLabel.qml index 86ab756be..6c3400266 100644 --- a/src/QmlControls/QGCLabel.qml +++ b/src/QmlControls/QGCLabel.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCListView.qml b/src/QmlControls/QGCListView.qml index 3c5205a9e..4f5a447d8 100644 --- a/src/QmlControls/QGCListView.qml +++ b/src/QmlControls/QGCListView.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.7 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCMapLabel.qml b/src/QmlControls/QGCMapLabel.qml index ebc49222c..5c9e3d497 100644 --- a/src/QmlControls/QGCMapLabel.qml +++ b/src/QmlControls/QGCMapLabel.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCMobileFileOpenDialog.qml b/src/QmlControls/QGCMobileFileOpenDialog.qml index 657784042..dd61da48b 100644 --- a/src/QmlControls/QGCMobileFileOpenDialog.qml +++ b/src/QmlControls/QGCMobileFileOpenDialog.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/QGCMobileFileSaveDialog.qml b/src/QmlControls/QGCMobileFileSaveDialog.qml index 06abfda2b..c1a3361a6 100644 --- a/src/QmlControls/QGCMobileFileSaveDialog.qml +++ b/src/QmlControls/QGCMobileFileSaveDialog.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/QGCMovableItem.qml b/src/QmlControls/QGCMovableItem.qml index afffce8a4..6ab616e5d 100644 --- a/src/QmlControls/QGCMovableItem.qml +++ b/src/QmlControls/QGCMovableItem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 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 ff6937d87..4e1095c53 100644 --- a/src/QmlControls/QGCPipable.qml +++ b/src/QmlControls/QGCPipable.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCRadioButton.qml b/src/QmlControls/QGCRadioButton.qml index cfcb5072c..9384328a0 100644 --- a/src/QmlControls/QGCRadioButton.qml +++ b/src/QmlControls/QGCRadioButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCSlider.qml b/src/QmlControls/QGCSlider.qml index d08303982..ed6cc417c 100644 --- a/src/QmlControls/QGCSlider.qml +++ b/src/QmlControls/QGCSlider.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Private 1.0 diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index 8b5497e90..19a4a103d 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Layouts 1.2 diff --git a/src/QmlControls/QGCToolBarButton.qml b/src/QmlControls/QGCToolBarButton.qml index f7d6c8ac9..5c392ebf9 100644 --- a/src/QmlControls/QGCToolBarButton.qml +++ b/src/QmlControls/QGCToolBarButton.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCView.qml b/src/QmlControls/QGCView.qml index 3f7daa123..4f4b98e92 100644 --- a/src/QmlControls/QGCView.qml +++ b/src/QmlControls/QGCView.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.3 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QGCViewDialog.qml b/src/QmlControls/QGCViewDialog.qml index bd164d364..71bb51f12 100644 --- a/src/QmlControls/QGCViewDialog.qml +++ b/src/QmlControls/QGCViewDialog.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.3 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCViewMessage.qml b/src/QmlControls/QGCViewMessage.qml index 4521c403f..c2b426932 100644 --- a/src/QmlControls/QGCViewMessage.qml +++ b/src/QmlControls/QGCViewMessage.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.3 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCViewPanel.qml b/src/QmlControls/QGCViewPanel.qml index 6e19b4443..c0f3b18cd 100644 --- a/src/QmlControls/QGCViewPanel.qml +++ b/src/QmlControls/QGCViewPanel.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.3 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Palette 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QmlTest.qml b/src/QmlControls/QmlTest.qml index a6a461ba2..cab585ecb 100644 --- a/src/QmlControls/QmlTest.qml +++ b/src/QmlControls/QmlTest.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/RCChannelMonitor.qml b/src/QmlControls/RCChannelMonitor.qml index 1f0acf02a..f647c72a0 100644 --- a/src/QmlControls/RCChannelMonitor.qml +++ b/src/QmlControls/RCChannelMonitor.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/RoundButton.qml b/src/QmlControls/RoundButton.qml index 498b7bdb1..1b17d477d 100644 --- a/src/QmlControls/RoundButton.qml +++ b/src/QmlControls/RoundButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.4 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index 0d2d2a27f..3802a60e9 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/src/QmlControls/ScreenTools.qml @@ -1,7 +1,7 @@ pragma Singleton -import QtQuick 2.4 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Window 2.2 import QGroundControl 1.0 diff --git a/src/QmlControls/SliderSwitch.qml b/src/QmlControls/SliderSwitch.qml index 7da6fd934..e62b46105 100644 --- a/src/QmlControls/SliderSwitch.qml +++ b/src/QmlControls/SliderSwitch.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml index 6698d27f1..c8cbb4c7b 100644 --- a/src/QmlControls/SubMenuButton.qml +++ b/src/QmlControls/SubMenuButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtGraphicalEffects 1.0 diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml index 0df07900f..b7842facd 100644 --- a/src/QmlControls/ToolStrip.qml +++ b/src/QmlControls/ToolStrip.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/VehicleRotationCal.qml b/src/QmlControls/VehicleRotationCal.qml index f399fa755..05026c651 100644 --- a/src/QmlControls/VehicleRotationCal.qml +++ b/src/QmlControls/VehicleRotationCal.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/VehicleSummaryRow.qml b/src/QmlControls/VehicleSummaryRow.qml index cc2a035fb..03b05f8b9 100644 --- a/src/QmlControls/VehicleSummaryRow.qml +++ b/src/QmlControls/VehicleSummaryRow.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 Row { diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index 985afec75..5d85a633e 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.1 import QtQuick.Layouts 1.2 diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index 8ab41ccf2..5d70cada6 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index feb04bba8..e2c4945b6 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/VehicleSetup/PX4FlowSensor.qml b/src/VehicleSetup/PX4FlowSensor.qml index e568a2511..8a024a4ed 100644 --- a/src/VehicleSetup/PX4FlowSensor.qml +++ b/src/VehicleSetup/PX4FlowSensor.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 diff --git a/src/VehicleSetup/SetupParameterEditor.qml b/src/VehicleSetup/SetupParameterEditor.qml index 9f1b2008f..38bc6360c 100644 --- a/src/VehicleSetup/SetupParameterEditor.qml +++ b/src/VehicleSetup/SetupParameterEditor.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml index ac1156397..86f5cd094 100644 --- a/src/VehicleSetup/SetupView.qml +++ b/src/VehicleSetup/SetupView.qml @@ -12,8 +12,8 @@ /// @brief Setup View /// @author Don Gagne -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.AutoPilotPlugin 1.0 diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index 25579a140..78e437c56 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl 1.0 diff --git a/src/ViewWidgets/CustomCommandWidget.qml b/src/ViewWidgets/CustomCommandWidget.qml index 936cac987..d131ebe86 100644 --- a/src/ViewWidgets/CustomCommandWidget.qml +++ b/src/ViewWidgets/CustomCommandWidget.qml @@ -11,8 +11,8 @@ /// @file /// @author Don Gagne -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 diff --git a/src/ViewWidgets/ViewWidget.qml b/src/ViewWidgets/ViewWidget.qml index bacf12c96..140f44a22 100644 --- a/src/ViewWidgets/ViewWidget.qml +++ b/src/ViewWidgets/ViewWidget.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.Palette 1.0 diff --git a/src/test.qml b/src/test.qml index 5a24d5d34..7f96cb90c 100644 --- a/src/test.qml +++ b/src/test.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QGroundControl.FactControls 1.0 diff --git a/src/ui/AppSettings.qml b/src/ui/AppSettings.qml index 4b161474d..a1b401222 100644 --- a/src/ui/AppSettings.qml +++ b/src/ui/AppSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtPositioning 5.2 import QGroundControl 1.0 diff --git a/src/ui/MainWindowHybrid.qml b/src/ui/MainWindowHybrid.qml index 1c27d9690..01ac26a51 100644 --- a/src/ui/MainWindowHybrid.qml +++ b/src/ui/MainWindowHybrid.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml index 0276d4055..639c28b3c 100644 --- a/src/ui/MainWindowInner.qml +++ b/src/ui/MainWindowInner.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtPositioning 5.2 diff --git a/src/ui/MainWindowNative.qml b/src/ui/MainWindowNative.qml index a4c8a5603..ded0dce50 100644 --- a/src/ui/MainWindowNative.qml +++ b/src/ui/MainWindowNative.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 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 9cc61e697..e78f3b673 100644 --- a/src/ui/preferences/BluetoothSettings.qml +++ b/src/ui/preferences/BluetoothSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.1 import QGroundControl 1.0 diff --git a/src/ui/preferences/DebugWindow.qml b/src/ui/preferences/DebugWindow.qml index 619eda29f..312b1258e 100644 --- a/src/ui/preferences/DebugWindow.qml +++ b/src/ui/preferences/DebugWindow.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index 4506b9174..9118f2ef1 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.1 import QtMultimedia 5.5 diff --git a/src/ui/preferences/LinkSettings.qml b/src/ui/preferences/LinkSettings.qml index cd4d75be0..a044fcf4c 100644 --- a/src/ui/preferences/LinkSettings.qml +++ b/src/ui/preferences/LinkSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.1 import QGroundControl 1.0 diff --git a/src/ui/preferences/LogReplaySettings.qml b/src/ui/preferences/LogReplaySettings.qml index 27e18cd02..ca93e4f60 100644 --- a/src/ui/preferences/LogReplaySettings.qml +++ b/src/ui/preferences/LogReplaySettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.1 import QGroundControl 1.0 diff --git a/src/ui/preferences/MavlinkSettings.qml b/src/ui/preferences/MavlinkSettings.qml index 83ac9ac8c..e90d2cbc3 100644 --- a/src/ui/preferences/MavlinkSettings.qml +++ b/src/ui/preferences/MavlinkSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.1 diff --git a/src/ui/preferences/MockLink.qml b/src/ui/preferences/MockLink.qml index 5c5e476fd..c850ae2dd 100644 --- a/src/ui/preferences/MockLink.qml +++ b/src/ui/preferences/MockLink.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.3 +import QtQuick 2.7 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/MockLinkSettings.qml b/src/ui/preferences/MockLinkSettings.qml index 1800d12a3..e15115c58 100644 --- a/src/ui/preferences/MockLinkSettings.qml +++ b/src/ui/preferences/MockLinkSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/ui/preferences/SerialSettings.qml b/src/ui/preferences/SerialSettings.qml index c7c09526a..901c89ef9 100644 --- a/src/ui/preferences/SerialSettings.qml +++ b/src/ui/preferences/SerialSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.1 import QGroundControl 1.0 diff --git a/src/ui/preferences/TcpSettings.qml b/src/ui/preferences/TcpSettings.qml index f523e6313..f80d69ea7 100644 --- a/src/ui/preferences/TcpSettings.qml +++ b/src/ui/preferences/TcpSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.1 import QGroundControl 1.0 diff --git a/src/ui/preferences/UdpSettings.qml b/src/ui/preferences/UdpSettings.qml index 323eb015e..c73677332 100644 --- a/src/ui/preferences/UdpSettings.qml +++ b/src/ui/preferences/UdpSettings.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.1 import QGroundControl 1.0 diff --git a/src/ui/toolbar/BatteryIndicator.qml b/src/ui/toolbar/BatteryIndicator.qml index 344c7714a..31e7d198d 100644 --- a/src/ui/toolbar/BatteryIndicator.qml +++ b/src/ui/toolbar/BatteryIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/ui/toolbar/GPSIndicator.qml b/src/ui/toolbar/GPSIndicator.qml index d73479069..e99583cd9 100644 --- a/src/ui/toolbar/GPSIndicator.qml +++ b/src/ui/toolbar/GPSIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index 8f656ceea..b2cf15a8e 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -7,9 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Layouts 1.2 -import QtQuick.Controls 1.2 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml index 16caea17a..e810c44f6 100644 --- a/src/ui/toolbar/MainToolBarIndicators.qml +++ b/src/ui/toolbar/MainToolBarIndicators.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/ui/toolbar/MessageIndicator.qml b/src/ui/toolbar/MessageIndicator.qml index aecd24614..a5d56696e 100644 --- a/src/ui/toolbar/MessageIndicator.qml +++ b/src/ui/toolbar/MessageIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/ui/toolbar/ModeIndicator.qml b/src/ui/toolbar/ModeIndicator.qml index c8aedaa87..92481387b 100644 --- a/src/ui/toolbar/ModeIndicator.qml +++ b/src/ui/toolbar/ModeIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/RCRSSIIndicator.qml b/src/ui/toolbar/RCRSSIIndicator.qml index 64471abf2..3b1b1f4d9 100644 --- a/src/ui/toolbar/RCRSSIIndicator.qml +++ b/src/ui/toolbar/RCRSSIIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 diff --git a/src/ui/toolbar/SignalStrength.qml b/src/ui/toolbar/SignalStrength.qml index 8b0932033..ada38752d 100644 --- a/src/ui/toolbar/SignalStrength.qml +++ b/src/ui/toolbar/SignalStrength.qml @@ -14,7 +14,7 @@ * @author Gus Grubba */ -import QtQuick 2.4 +import QtQuick 2.7 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 145fa6519..da57b9b48 100644 --- a/src/ui/toolbar/TelemetryRSSIIndicator.qml +++ b/src/ui/toolbar/TelemetryRSSIIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import QGroundControl 1.0 -- 2.22.0