diff --git a/src/AnalyzeView/AnalyzePage.qml b/src/AnalyzeView/AnalyzePage.qml index 36fc36048b6a3e8772d23d236dbb9564a29b3516..c7e2e0924761fc6ab0458446bfd0c2663ad8f2bf 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 1.4 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AnalyzeView/AnalyzeView.qml b/src/AnalyzeView/AnalyzeView.qml index cd910754a9c1f1fbf2f890b1e2cece19d6ad94bf..89fb527ae345c7f1a5f96dbe9142a894b748b5e5 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 1.4 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AnalyzeView/GeoTagPage.qml b/src/AnalyzeView/GeoTagPage.qml index a4881a7f8bbb36433a770ca87ea600a66b16165b..625c94fcd012111ac22664fb32a49b8831239e4c 100644 --- a/src/AnalyzeView/GeoTagPage.qml +++ b/src/AnalyzeView/GeoTagPage.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 diff --git a/src/AnalyzeView/LogDownloadPage.qml b/src/AnalyzeView/LogDownloadPage.qml index 8baf6532ed15bcc1f235e4c664498c2a15b5ea4e..79c263e86bcb1b6264ce8fb137b541b6fe6101b8 100644 --- a/src/AnalyzeView/LogDownloadPage.qml +++ b/src/AnalyzeView/LogDownloadPage.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml index bcf4cef9085790bf234830d25874c4f9cbfbe6ab..bb0f4b8269e86fbf83efb40d7bbb6ded134c0e91 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml index 8ba3da326c658806d04e1d21185ce1a1a56cc649..b962a8befc3023c4d77b9368713ddeed41734cfd 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMCameraComponent.qml b/src/AutoPilotPlugins/APM/APMCameraComponent.qml index 0eafaade9402fde0f18b24d767affde9cdb32c1e..2df39dbfb04cd49d3a3436bdcc42b019648492ae 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml b/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml index 92fc33afaa482edb5029981487b968dda5ef4bdf..d24ddb2933cbc91c23063609fe6305121346ee7f 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml b/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml index 623be09030f195daaa3c7ec4b20d05bc86f576c0..a105c5e044deae106dff3605819d6c12a99a53f1 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml b/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml index f0237a2e11c5dfe50fd9ecb46e8f2a8cb0f9dc67..f61a170305fdf40661b0b6d8dc1bcfed64d66485 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMLightsComponent.qml b/src/AutoPilotPlugins/APM/APMLightsComponent.qml index b2eac54bb67e2dc320ed73e56c2a91e59881e4cd..7be9951584c0ad2812f8f6ec5e89dbfd0885cd3c 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml b/src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml index 7712df99c7169cfafd95b0a2fed9107b075cda50..a96c4f4d4eea3ce7efea982af09068076c3803b6 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 1.4 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 c57eca946c619a3ac9f6438acfab997641f9dcc9..7207f3cc26b72e8f1b6765afa7e34baf3cdf672e 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 7cb5437a1d0a5f67c83b9e17f2195dff1055c894..361b349cb82058c703c94cd7c03d954fcb0ba1e6 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml index 62d55dd3005dd22e1f0eb6c19487ec6196cfd742..fa0c34f456a7aa0e0ee88a4f0d364521ae7b68ea 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml b/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml index 93ed476224ec9c7a1ac3a5081c3d0a93866c7f08..2fe3b105a1c831682032f00e4cdb1b916b9841d7 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml index 3d2495395d2f5b054195af3cea3f4a7147b2cdf8..a1ec061a5664699d70a19ec1834d12ca649d292d 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 1.4 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml index 6b1515b38c4f01ce8bd07649c16a47aa5e5f0bde..7055357886f3649c899a45322b33f33c475336aa 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 1.4 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml index c57eca946c619a3ac9f6438acfab997641f9dcc9..7207f3cc26b72e8f1b6765afa7e34baf3cdf672e 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 12f8103225e4ee7f7ca70071d036b6fce8368ba1..6a3b25d80fcb6c694865f217f11a377304f4bb3e 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 1.4 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml index 9e2a597a280d9510d58c93d1635786a98d6ecdb2..12c8ceaf3a6c01e582eb948405cc2b9a7478e6fc 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml index ccb832be71092fc84ffd6b6a133a8a7fd2818c28..f3da5bc02ad94ddfc82a50b419eadaa2508ab419 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 1.4 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 c57eca946c619a3ac9f6438acfab997641f9dcc9..7207f3cc26b72e8f1b6765afa7e34baf3cdf672e 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 1ab63b7c4ce3df851f220f342f8c01c5ac40a10d..fd81d910a24c83ee332f1583319945ec502424cf 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml index 1f328647edbdc01adb929a6255b9524e244c4351..536311d3b5b776ae356fc29a3ff9aecfab94b044 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml index 85bd337309c1de6fe8eedc6b0a8f8b6e27969869..2f616eb43d11e2af77f861c74d52db12cdbd7bb6 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml @@ -1,6 +1,6 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml index df06fec69595a36fae33cd6ebc766a233748a4b3..26375d65244a0a717f489d5e1a9873557e349536 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml b/src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml index e2b33b2fa14f8724eedafd11a9167bfeaa24a7ff..041c728808e447587dd7ec513935b8e6353d175b 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml index 4547fbd3cf18c4be1efb3527e6c98cdf448d1139..314a4fa2bf47e7947d01dc149bc1531e7119741f 100644 --- a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/Common/ESP8266Component.qml b/src/AutoPilotPlugins/Common/ESP8266Component.qml index dc439514d49bb6b8c51cab46b70a83947fed122d..90fc2d60187e5980dfdb3aad30bd9d1781b7ed9e 100644 --- a/src/AutoPilotPlugins/Common/ESP8266Component.qml +++ b/src/AutoPilotPlugins/Common/ESP8266Component.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml index 3720a1e751961bb983a6eb531ed77aa414701d2d..db6b7588b864fef78dbaed255164374c5c5cc089 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/Common/MixersComponent.qml b/src/AutoPilotPlugins/Common/MixersComponent.qml index 84034427b3faf0fc486eee7bde72c68ac090c98e..9dcea5dec8b0661a64102cb70c2b9066bb855c4e 100644 --- a/src/AutoPilotPlugins/Common/MixersComponent.qml +++ b/src/AutoPilotPlugins/Common/MixersComponent.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/Common/MotorComponent.qml b/src/AutoPilotPlugins/Common/MotorComponent.qml index fd41c08a3fe7b3deaa07fe07464057f8d9ead5fc..b2e9a29a2f75730aa202add1e5824f1d3308d4df 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/Common/RadioComponent.qml b/src/AutoPilotPlugins/Common/RadioComponent.qml index 2d4bd7fc6ddc7c344b1234052ab862dbe69fa849..5c9b522ab16ab350164ef5856bd4b7a4742c1fa8 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/Common/SetupPage.qml b/src/AutoPilotPlugins/Common/SetupPage.qml index f59cd7dc0c9d071d771bd7d544735713c6a676a0..3a46d80a37a13cd9f313f457df84db6d6ff35674 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.qml b/src/AutoPilotPlugins/PX4/AirframeComponent.qml index 13a3f3b8f83cdf0d8d8aaeef78bc869e9241f583..6dd546a34f930afa2582bbae4ef67205bf67d449 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml index d95371ef3793abe9df607cdb198bab9c17e9335a..cb298cbf47503007ecf75f65c0279655132f2fb5 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/CameraComponent.qml b/src/AutoPilotPlugins/PX4/CameraComponent.qml index 7b523f5a187c9ac80388cca1b5e96865320031ea..282a79426e2a8f1fe94e55ab38893a2611d97a44 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponent.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponent.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 import QGroundControl 1.0 diff --git a/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml b/src/AutoPilotPlugins/PX4/CameraComponentSummary.qml index 6ebc862a4f0dadaeadfec48c7456df132a6a826c..cedff9183efaea529d774446bfc598093bdeef07 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml index b779080c01c945b417e225e250dd0e1980a15a5c..d6057d4df75cd69156b72467b60087556e1eb106 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml index 7646859340b17ab9f9328bf0b8367293ec6d241a..fbebba083d1d85df9aea3d1308a9a084a6bad4be 100644 --- a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.3 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml index dad5c931caca81c96fd8386a5dbac6bd60cd3a4b..555ef689a88b4d2b8e120ac61e4b56c5cfccf89e 100644 --- a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.3 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml index 6704f871f572c5db171c1d7a1016904479334b92..9b5cca62e151b35db2f55542ac5055cd4fe8e5fc 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml index 5198684ce381ceb5bf688d0831d32802f4e17230..73fd7014ea1db14c8b191f4e282b15e1277d2f3d 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml index e2d484e1bcb78d4921e96590f80955b5f56f5979..25e3cf261b1f8c2111462d486ddf1b710817aaaa 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml index 4c1eed32adb21db96c5b6f7a8282dd601e2a1dcc..d85d3dbd630494b1fa037dabb259352c69d7f7d3 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml index e715c2a6ce46de0b485548f451a040c504ea2d17..ccfa5a3b8da4b64b1113494e74fa5e2fd83fb38b 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index 7d992a40f8bed6d59126b36eb8fe459af91fef3e..d54aa61fd974d7cd6cfaa3b27bedbb3e45a7a849 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml index eff4c101db7e386ec5c9de2699e62b0bbd88c23b..909d571bf66fcc6f73e69a7c52663cd9bb394c35 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.qml b/src/AutoPilotPlugins/PX4/SafetyComponent.qml index 6532da76ad0807754d9234ea240262435688825a..66ccedf57b54551aeafe97733609e53e397cb41b 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml index 9b6a2b13c18d15d698a5dfc16179e46f2d7a43db..0744e1f9838a55a25665f0fc0ab7ea06ce891bc3 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.qml b/src/AutoPilotPlugins/PX4/SensorsComponent.qml index 7a732d786fb68995fe733751de4b83b4d74e4adc..9018f733e3ad768a402a561d3cb60563807e15c3 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponent.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponent.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml index 606d94819e69166f638bad12ed18b0d9cc053faf..751bc222808a076dd96a620338cc09633e850a74 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml index 0f353ead634ab1487162986906830f33b46a1262..711ff75cf142d667e288059851ea872866dc41f6 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.FactControls 1.0 diff --git a/src/FactSystem/FactControls/FactBitmask.qml b/src/FactSystem/FactControls/FactBitmask.qml index b01ae793b5d971fb19b86b4e1297ef94f9fb583b..6e970829ee65cedf503e78c97a1a22887c14e279 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.Palette 1.0 diff --git a/src/FactSystem/FactControls/FactCheckBox.qml b/src/FactSystem/FactControls/FactCheckBox.qml index f64d20041a0dcfb784144daa32be2679cd5346cd..3f9cd2eee463db0c9b9296464905fdfd99cebde6 100644 --- a/src/FactSystem/FactControls/FactCheckBox.qml +++ b/src/FactSystem/FactControls/FactCheckBox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.Palette 1.0 diff --git a/src/FactSystem/FactControls/FactComboBox.qml b/src/FactSystem/FactControls/FactComboBox.qml index d56bbf11fc4ffc2a7c5115e76d7cd103639f6333..9ab25c77ab134bcd28c4cdf2b935dc9708c685b0 100644 --- a/src/FactSystem/FactControls/FactComboBox.qml +++ b/src/FactSystem/FactControls/FactComboBox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.Palette 1.0 diff --git a/src/FactSystem/FactControls/FactLabel.qml b/src/FactSystem/FactControls/FactLabel.qml index 461794102d3b2975094874dd2ee92010288dd79b..d1c7e02eaab25dc8ae74be722f5aa98913ff9291 100644 --- a/src/FactSystem/FactControls/FactLabel.qml +++ b/src/FactSystem/FactControls/FactLabel.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.Palette 1.0 diff --git a/src/FactSystem/FactControls/FactPanel.qml b/src/FactSystem/FactControls/FactPanel.qml index a5fb64b3374185b4090981dfd4aa9277d1cfbd68..3c72bc9585e6cc4ee12f976a4a7b6629021a4a7a 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 1.4 import QGroundControl.FactSystem 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FactSystem/FactControls/FactTextField.qml b/src/FactSystem/FactControls/FactTextField.qml index 58a7093609898675b3ced471dddbd437d0768162..4f4f032a8e06dc73e9454b19ef9165969b041b9b 100644 --- a/src/FactSystem/FactControls/FactTextField.qml +++ b/src/FactSystem/FactControls/FactTextField.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QGroundControl.FactSystem 1.0 diff --git a/src/FactSystem/FactControls/FactTextFieldGrid.qml b/src/FactSystem/FactControls/FactTextFieldGrid.qml index 90097c7310111fc9b31629f577359561a3a08d91..3d21daeb1cbdfdb85c2200e50e7a781e1980647c 100644 --- a/src/FactSystem/FactControls/FactTextFieldGrid.qml +++ b/src/FactSystem/FactControls/FactTextFieldGrid.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Layouts 1.3 import QGroundControl.FactSystem 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FactSystem/FactControls/FactTextFieldRow.qml b/src/FactSystem/FactControls/FactTextFieldRow.qml index 36ea7ca08edb4f71724c705912fb3e828c674f09..704317e0d91ab0744c06c94e44ab803892611807 100644 --- a/src/FactSystem/FactControls/FactTextFieldRow.qml +++ b/src/FactSystem/FactControls/FactTextFieldRow.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Layouts 1.3 import QGroundControl.FactSystem 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FactSystem/FactSystemTest.qml b/src/FactSystem/FactSystemTest.qml index 8ac4d9ada73ac7759b67e27573bd4d3b462b69c9..6d35e3c655c682b4dd646893ea441b590f00f175 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 1.4 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 217ba564dcaca1324ff69a8a9261049bde86d710..c3c62355a43bc5420ce726fb4c41fc8be05b9d2b 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 480d3213d31c662ad1eabad7fef12d64d04521c9..feddf1c42c1b10440f46278ced438b22039b1df0 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 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml b/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml index 39c41aafe1ce74cab080a44897b324c42702f52a..21c0148e1700a91f1b6659df0479f1bee75561c7 100644 --- a/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml +++ b/src/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/NoGeoFenceEditor.qml b/src/FirmwarePlugin/NoGeoFenceEditor.qml index 93138f1df88877333e7d04814ed86b8472bbb127..e6a2b99d4737ef9664574395f61111251cacd8a2 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 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml b/src/FirmwarePlugin/PX4/PX4GeoFenceEditor.qml index 441f26a488fdd61833a25c5b7db1a84924174144..f8670dbe556f5e0a3f8b2e9ebcf37d57682d3d4d 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 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 07f4c68327bb9515c4cba56019f363a21fa46b4f..c099bddea8bc1447f5e8889c16372bc4985b672b 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -8,13 +8,13 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.3 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtLocation 5.3 -import QtPositioning 5.2 -import QtMultimedia 5.5 +import QtLocation 5.6 +import QtPositioning 5.5 +import QtMultimedia 5.8 import QGroundControl 1.0 import QGroundControl.FlightDisplay 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewDummy.qml b/src/FlightDisplay/FlightDisplayViewDummy.qml index 286c321432ca8995364e01c30fb4ebff1b8f1cb6..b53a99e3b23c4d2f3ec728d8cb04a636b1020da4 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 12c7b7fdc83272a14a8ccefb07d7d9cf6b248e61..fed9d42387d1f12dd30521834827cfad0bd86f24 100644 --- a/src/FlightDisplay/FlightDisplayViewMap.qml +++ b/src/FlightDisplay/FlightDisplayViewMap.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 -import QtLocation 5.3 -import QtPositioning 5.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.FlightDisplay 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewUVC.qml b/src/FlightDisplay/FlightDisplayViewUVC.qml index f9608320557348951e12a495a9afae4d7f507d1e..bb011c55087aff894d067da052e71c745843b2ce 100644 --- a/src/FlightDisplay/FlightDisplayViewUVC.qml +++ b/src/FlightDisplay/FlightDisplayViewUVC.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtMultimedia 5.5 +import QtQuick 2.7 +import QtMultimedia 5.8 import QGroundControl 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml index b3ea10af40682e98d964bf164169bb1b1894b5f3..454360ba01cd8c32078bb930ba3bb997c4308221 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 1.4 import QGroundControl 1.0 import QGroundControl.FlightDisplay 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index fd553fde2ffc1e8b3ead0d974c1e4062646db6f2..8fe27486dc96f64f62c6cd22caadca9704cdf4c5 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -8,12 +8,12 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtLocation 5.3 -import QtPositioning 5.2 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightDisplay/MultiVehicleList.qml b/src/FlightDisplay/MultiVehicleList.qml index a266bf0b6dd13f9a79f990f63ff70395bec336d0..15cb3f9e1bf5fceaa6e2b70d949f8413e6fd039e 100644 --- a/src/FlightDisplay/MultiVehicleList.qml +++ b/src/FlightDisplay/MultiVehicleList.qml @@ -7,9 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightDisplay/VirtualJoystick.qml b/src/FlightDisplay/VirtualJoystick.qml index f10d4e2d25e74641bcad74a40a398217fc9c9b83..c5e4fa70d5cefb06ed72e2af7b9b710710a08227 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 894d1dde1bc5ce5f5c36d8b3ffc2c12c327ae3af..3192baeffdd5ca9bf17d040f53987b14e61936b2 100644 --- a/src/FlightMap/FlightMap.qml +++ b/src/FlightMap/FlightMap.qml @@ -14,10 +14,10 @@ * @author Gus Grubba */ -import QtQuick 2.4 -import QtQuick.Controls 1.3 -import QtLocation 5.3 -import QtPositioning 5.3 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/FlightMap/MapItems/MissionItemIndicator.qml b/src/FlightMap/MapItems/MissionItemIndicator.qml index 58ad845430ee9c7460a3d7e61a9830e319d8c7b1..016891b8fe504289f60962e4cb1ace5413d8e7b5 100644 --- a/src/FlightMap/MapItems/MissionItemIndicator.qml +++ b/src/FlightMap/MapItems/MissionItemIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtLocation 5.3 +import QtQuick 2.7 +import QtLocation 5.6 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml index 345f78f94e5095ff12c448219cab51f3672e477d..cfda94fda08aaef0ba658eb95a8a1238c2da99a8 100644 --- a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml +++ b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtLocation 5.3 +import QtQuick 2.7 +import QtLocation 5.6 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/MapItems/MissionItemView.qml b/src/FlightMap/MapItems/MissionItemView.qml index 2065ca958da1ce6568341e3b8d29b77a723b9f3f..fa0a8810c40495eb05413e0ab0f19781b62bd590 100644 --- a/src/FlightMap/MapItems/MissionItemView.qml +++ b/src/FlightMap/MapItems/MissionItemView.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtLocation 5.3 -import QtPositioning 5.3 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.FlightMap 1.0 diff --git a/src/FlightMap/MapItems/MissionLineView.qml b/src/FlightMap/MapItems/MissionLineView.qml index 9d7a3b709e5718c7e7b8b753a2566a2b23792197..959ac1bb73f5de86055aa28373023261025a81d4 100644 --- a/src/FlightMap/MapItems/MissionLineView.qml +++ b/src/FlightMap/MapItems/MissionLineView.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtLocation 5.3 -import QtPositioning 5.3 +import QtQuick 2.7 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/FlightMap/MapItems/PolygonEditor.qml b/src/FlightMap/MapItems/PolygonEditor.qml index 15fa0d20d2ce63be0bc9c517b31db8009f3f339c..a3cba825cbd595c805ffb3306e96f753ca0f5073 100644 --- a/src/FlightMap/MapItems/PolygonEditor.qml +++ b/src/FlightMap/MapItems/PolygonEditor.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtLocation 5.3 +import QtQuick 2.7 +import QtLocation 5.6 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 @@ -69,8 +69,8 @@ Item { adjustingPolygon = true for (var i=0; i -import QtQuick 2.4 -import QtLocation 5.3 -import QtPositioning 5.3 +import QtQuick 2.7 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl.ScreenTools 1.0 import QGroundControl.Vehicle 1.0 diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml index 8a265d86398904f128e0779636ec5e18d3fb6830..46ad0f33f44c65148a4de76c160eafc6a7ca9c55 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 1.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/QGCVideoBackground.qml b/src/FlightMap/QGCVideoBackground.qml index 4a99d6da368f6c7ba0d680cd36e8291eb8bea5e4..ba1ee9f08ebc1902c80d5b33c6d250e42346d939 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 1.4 import QGroundControl.QgcQtGStreamer 1.0 VideoItem { diff --git a/src/FlightMap/Widgets/CameraWidget.qml b/src/FlightMap/Widgets/CameraWidget.qml index 8e0ec95ce15a6ef7cfff29826b81e17cb4341eed..8f3aa7724bb801c95cafeddda75bb11b7fed4c3e 100644 --- a/src/FlightMap/Widgets/CameraWidget.qml +++ b/src/FlightMap/Widgets/CameraWidget.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/CenterMapDropButton.qml b/src/FlightMap/Widgets/CenterMapDropButton.qml index 9fb58839e6a5e88e991b3aa2e0c362f414af44cc..67c8bb0ee3d5bb5f5838ea69ba76b2f40598b4bf 100644 --- a/src/FlightMap/Widgets/CenterMapDropButton.qml +++ b/src/FlightMap/Widgets/CenterMapDropButton.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 -import QtQuick.Layouts 1.2 -import QtPositioning 5.3 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/Widgets/CenterMapDropPanel.qml b/src/FlightMap/Widgets/CenterMapDropPanel.qml index a8adffc0cfac46e852eb2496a3700e46b4feb9c1..ac14217b6e8b12e3383c9221488381818a3c4df9 100644 --- a/src/FlightMap/Widgets/CenterMapDropPanel.qml +++ b/src/FlightMap/Widgets/CenterMapDropPanel.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 -import QtQuick.Layouts 1.2 -import QtPositioning 5.3 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/Widgets/InstrumentSwipeView.qml b/src/FlightMap/Widgets/InstrumentSwipeView.qml index 22ec90583a3cf666723ca9ef51b12a0fc6b266f9..cea7f46a0bd41ec969a06e9ec676cc57dd3d9b57 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 1.4 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 dc76a54fe0672d6da042774b93f868d470297972..155daa8ef1ff85e12fbdc19aeee19ca4f00ade5a 100644 --- a/src/FlightMap/Widgets/MapFitFunctions.qml +++ b/src/FlightMap/Widgets/MapFitFunctions.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtPositioning 5.3 +import QtQuick 2.7 +import QtPositioning 5.5 import QGroundControl 1.0 diff --git a/src/FlightMap/Widgets/QGCArtificialHorizon.qml b/src/FlightMap/Widgets/QGCArtificialHorizon.qml index 73f876536ab60159683fe5929419b481e3514cee..f37dd0cff34b67a3906b3372058a343a729fc242 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 f22cd54e3569bb92be832cd7c6550d9115043a5d..ac11eb010f9efa99c6a20a0288307c86383d5d49 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 b3358db3d0d486949fefc25933b34140213480d6..9c8619af7e8537561a4d1d4480c23a8a91b4de36 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 a8e107180e32b41d45ccf242cffdb06a4c25a1ef..484789a3fdd1ef4898dbc2f0ee1834c15695be44 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 a5b81c55a2ca64ef57bf7ff6bf6ab805f3ceab53..a8d36f39e5b1a5973d5fb33a1913b7f0aa9a0e48 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 03d5e34f323724675d3a8d3484d7349718e28936..dec8863372ae947a0756d36db3ff6fd4159db4d1 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 594aa5ac93f9d20f7795c2a31cd30bbb842db740..c7ca4c81ce84dad20350faa420f53e69edcecd51 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 62292194938a7151a7ad0e8fa0143727b54e2c1c..de26454016672258405da4939c86ef2491418370 100644 --- a/src/FlightMap/Widgets/ValuesWidget.qml +++ b/src/FlightMap/Widgets/ValuesWidget.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/FlightMap/Widgets/VehicleHealthWidget.qml b/src/FlightMap/Widgets/VehicleHealthWidget.qml index b1c73ae9d00b5830070609428903275d20f11bfa..680f9cb4a49989455a8ecd85cd1e7715e581bc38 100644 --- a/src/FlightMap/Widgets/VehicleHealthWidget.qml +++ b/src/FlightMap/Widgets/VehicleHealthWidget.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/FlightMap/Widgets/VibrationWidget.qml b/src/FlightMap/Widgets/VibrationWidget.qml index 0a7cb00875a909956d2c693b1c98b797a1a242ce..b24132ebc50a1078c48800f958ff4f5adbc80a70 100644 --- a/src/FlightMap/Widgets/VibrationWidget.qml +++ b/src/FlightMap/Widgets/VibrationWidget.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QGroundControl.Controls 1.0 diff --git a/src/MissionEditor/FWLandingPatternEditor.qml b/src/MissionEditor/FWLandingPatternEditor.qml index 8d26b50b1ea97f492dc74e58402eced177f465ab..2fbdf09829165e175654bacf89e49a70f3166e7b 100644 --- a/src/MissionEditor/FWLandingPatternEditor.qml +++ b/src/MissionEditor/FWLandingPatternEditor.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/FWLandingPatternMapVisual.qml b/src/MissionEditor/FWLandingPatternMapVisual.qml index 81fd35e7f20ed6adae49c495dd07a3dcb94c828a..681a51e18aa353342b9f7c5aec8d08b7aee553e4 100644 --- a/src/MissionEditor/FWLandingPatternMapVisual.qml +++ b/src/MissionEditor/FWLandingPatternMapVisual.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtLocation 5.3 -import QtPositioning 5.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/GeoFenceEditor.qml b/src/MissionEditor/GeoFenceEditor.qml index 0d0d38ebac37bfc387835aadcf00dbc3e21d22e3..e430dd5db62ac447ee2a84d933aa3ddd042228b5 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 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index 4898a6cde095bac7c05c559473bf3d82ec69ff79..c466f2fef95e2b79b6759c0edd5f2169b8160268 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -8,12 +8,12 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtLocation 5.3 -import QtPositioning 5.3 -import QtQuick.Layouts 1.2 +import QtLocation 5.6 +import QtPositioning 5.5 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.FlightMap 1.0 diff --git a/src/MissionEditor/MissionItemEditor.qml b/src/MissionEditor/MissionItemEditor.qml index 156345685abacd2cd2ff97222ad9dc85a347f674..913a85ae10eeadcee1caa16465dab36ce139d6f1 100644 --- a/src/MissionEditor/MissionItemEditor.qml +++ b/src/MissionEditor/MissionItemEditor.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/MissionItemMapVisual.qml b/src/MissionEditor/MissionItemMapVisual.qml index 585d159ce0c1aff525ea1fcb554994cd165dc87c..0508eb757962266aa4952d6646afc1dd71a2251d 100644 --- a/src/MissionEditor/MissionItemMapVisual.qml +++ b/src/MissionEditor/MissionItemMapVisual.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtLocation 5.3 -import QtPositioning 5.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/MissionEditor/MissionItemStatus.qml b/src/MissionEditor/MissionItemStatus.qml index 2aad79b34b699c69c86626ed4142f4995fa3468b..9c508cec6f70e25ffe1c7829fa2d88ff059b2ed0 100644 --- a/src/MissionEditor/MissionItemStatus.qml +++ b/src/MissionEditor/MissionItemStatus.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.3 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 diff --git a/src/MissionEditor/MissionSettingsEditor.qml b/src/MissionEditor/MissionSettingsEditor.qml index b209b6e113f13d30339a7112bea2b3bbfea00c22..337927a2435fbcfb4ec589dfb03e81ab5eabf0b1 100644 --- a/src/MissionEditor/MissionSettingsEditor.qml +++ b/src/MissionEditor/MissionSettingsEditor.qml @@ -1,6 +1,6 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/QGCMapPolygonControls.qml b/src/MissionEditor/QGCMapPolygonControls.qml index 01f520e39c84d9b507b9dffc3e6cb7bd7e877700..11d6a70ab882d8b822d0a528f390b60350aba4a4 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 1.4 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 diff --git a/src/MissionEditor/RallyPointEditorHeader.qml b/src/MissionEditor/RallyPointEditorHeader.qml index ada44fc27b9b98a53c2bf1a98c07cb6f3f33c322..1f45d9fee885402cda816f4b476437a96647c511 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 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/RallyPointItemEditor.qml b/src/MissionEditor/RallyPointItemEditor.qml index 6d02d007591d860112f206736138051b531da313..ff3805a5b50a29079d3dcda1abf16cfdc8c34ff7 100644 --- a/src/MissionEditor/RallyPointItemEditor.qml +++ b/src/MissionEditor/RallyPointItemEditor.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl.ScreenTools 1.0 import QGroundControl.Vehicle 1.0 diff --git a/src/MissionEditor/SimpleItemEditor.qml b/src/MissionEditor/SimpleItemEditor.qml index 677656d768784c8f8288638f6e5e205dc68e8285..b4aa79b792ee787dd5da6b316942d780f18d8443 100644 --- a/src/MissionEditor/SimpleItemEditor.qml +++ b/src/MissionEditor/SimpleItemEditor.qml @@ -1,8 +1,8 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl.ScreenTools 1.0 import QGroundControl.Vehicle 1.0 diff --git a/src/MissionEditor/SimpleItemMapVisual.qml b/src/MissionEditor/SimpleItemMapVisual.qml index 7146ecc0d6d5ebaa2ce493bd98a9c8a3dc590884..0c5708e67e56e8605f82ab5066a4ef1ca1209348 100644 --- a/src/MissionEditor/SimpleItemMapVisual.qml +++ b/src/MissionEditor/SimpleItemMapVisual.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtLocation 5.3 -import QtPositioning 5.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml index 0117c4221500eeb507b6aeb81dafc7a52019df52..0d84de9176a439fedb88e84daa7e41243ee7b786 100644 --- a/src/MissionEditor/SurveyItemEditor.qml +++ b/src/MissionEditor/SurveyItemEditor.qml @@ -1,7 +1,7 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/SurveyMapVisual.qml b/src/MissionEditor/SurveyMapVisual.qml index a438fb7077895fa7b5aaac001601529468539a16..cfbdb092c5772b988d8cea504f0ca8aeea998674 100644 --- a/src/MissionEditor/SurveyMapVisual.qml +++ b/src/MissionEditor/SurveyMapVisual.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtLocation 5.3 -import QtPositioning 5.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtLocation 5.6 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MultiVehicle/MultiVehicleView.qml b/src/MultiVehicle/MultiVehicleView.qml index 2aa15bf61bfa72fd2a8d9b4047868b0a6c4eef0b..c7125ffcbf504a32938f48f93acabfa5de07a53e 100644 --- a/src/MultiVehicle/MultiVehicleView.qml +++ b/src/MultiVehicle/MultiVehicleView.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml index de919c5511c3751bb779377ee399b4c20383d650..4b2d62a1942b5585d4177cc634b688d670bb2fcb 100644 --- a/src/QmlControls/AppMessages.qml +++ b/src/QmlControls/AppMessages.qml @@ -7,9 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/ClickableColor.qml b/src/QmlControls/ClickableColor.qml index 28c7e5744f1e03aa8b08f9207b91ce13ec27f52d..52fc16accff3278e76946db149e35687c20ceb15 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 1.4 import QtQuick.Dialogs 1.2 Rectangle { diff --git a/src/QmlControls/DropButton.qml b/src/QmlControls/DropButton.qml index b8deec86f369ea8eb32e78d056137550bad188eb..e5f79dbb3f68d99995e62e9c7b944c4254e65291 100644 --- a/src/QmlControls/DropButton.qml +++ b/src/QmlControls/DropButton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.4 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/DropPanel.qml b/src/QmlControls/DropPanel.qml index 68303bb3b7c2222fd3bb7c5e31df8028804bfef2..7c606cf35297daebe6f91b472bd72963a2cc764a 100644 --- a/src/QmlControls/DropPanel.qml +++ b/src/QmlControls/DropPanel.qml @@ -7,9 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ExclusiveGroupItem.qml b/src/QmlControls/ExclusiveGroupItem.qml index d37546c5ca2b59794f6baf7d752011bfa24184a4..1e7ade2e4ad0989ea5c3d4743f1adc98486e6eac 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 1.4 /// The ExclusiveGroupItem control can be used as a base class for a control which diff --git a/src/QmlControls/FactSliderPanel.qml b/src/QmlControls/FactSliderPanel.qml index 2d1fc417e245e435957b3d772acca4ded064dc88..fd9259f7829b24323cad71db0f7f2f26c87afbf2 100644 --- a/src/QmlControls/FactSliderPanel.qml +++ b/src/QmlControls/FactSliderPanel.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QGroundControl.FactSystem 1.0 diff --git a/src/QmlControls/FlightModeDropdown.qml b/src/QmlControls/FlightModeDropdown.qml index 80543860611f3e0648d25e0a9489a3fbb27b8739..d32823edabb81b4d89250dcbaaa5c883fd9a4c42 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 2f7794913b052be3f440045682d01572e50fcabc..35ad1c506f6f3197c02c38ede39a4f5cc7e3e2ba 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 1.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/GuidedBar.qml b/src/QmlControls/GuidedBar.qml index 66705d51684eb3a6f8b9ddb3d3488a5ed600b4a1..8cad2aad1022a5d6e6241b722ab3723972442c17 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 40d8a2ce4bc6c34252f12e4fbcff932aa58c296d..df924f648bf03097b08ab37fa4b5af5bce7fc85b 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 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/JoystickThumbPad.qml b/src/QmlControls/JoystickThumbPad.qml index 7039492f0f18dc4ee2f03f5b6c2a556401735ce6..90e954f0b6b4e67e3145893f5f1719e42baa98f8 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 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/MissionCommandDialog.qml b/src/QmlControls/MissionCommandDialog.qml index 1a8503ecffb74b2c3b32d26bb211f17dc6211d95..b0a73ee8351a755e279d26fa681987023f765635 100644 --- a/src/QmlControls/MissionCommandDialog.qml +++ b/src/QmlControls/MissionCommandDialog.qml @@ -8,7 +8,7 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QGroundControl 1.0 diff --git a/src/QmlControls/MissionItemIndexLabel.qml b/src/QmlControls/MissionItemIndexLabel.qml index 2dbf5bbedf6e9e895d15192e1b083a487b890cc4..746d14d6cf09af5131e003981c61615c0c6b0115 100644 --- a/src/QmlControls/MissionItemIndexLabel.qml +++ b/src/QmlControls/MissionItemIndexLabel.qml @@ -1,6 +1,6 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/ModeSwitchDisplay.qml b/src/QmlControls/ModeSwitchDisplay.qml index de4c4a093b7bcd19cade20650992ebd0348ac4b8..0322c6ac35542d79e5e568b2de55908fe9f9ec37 100644 --- a/src/QmlControls/ModeSwitchDisplay.qml +++ b/src/QmlControls/ModeSwitchDisplay.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/MultiRotorMotorDisplay.qml b/src/QmlControls/MultiRotorMotorDisplay.qml index 2034e9806be2b75c32af00dfd2887ee64ad6a48a..cec5646129c7c04da815062d457742e5492ca7f4 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 8bfa2704f27dc7a6ab3a38f2199a7c0ec191e3a1..63f391933ca59271bbc063c347a6e9f43991d2f2 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 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 61621b69ed9cbfd749a6486568ea10dfcf69fd8a..1d1ed8d3cdd2e7d13a408d960ce21668a8862582 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml index 41b8966e383d12b29eee821d6bf70977b4a6865d..0614f1064e7adca7d1c04518f1318965feb65363 100644 --- a/src/QmlControls/ParameterEditorDialog.qml +++ b/src/QmlControls/ParameterEditorDialog.qml @@ -7,9 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.3 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index 55fe10af6573b596b8fba91a6a76857a679613f9..123faa6ab51da2a058ee472cc9c3513a7ba26a90 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -1,7 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QtQuick.Controls.Private 1.0 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCCheckBox.qml b/src/QmlControls/QGCCheckBox.qml index 7cf0c4bc64580dc41024076f1399b6fb9689bb2c..6628460e7c63630066000785b075c8e49b67da45 100644 --- a/src/QmlControls/QGCCheckBox.qml +++ b/src/QmlControls/QGCCheckBox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCColoredImage.qml b/src/QmlControls/QGCColoredImage.qml index 84e377f9345465b355db5374b43a0f8278016e13..455f67c439bf7c73358da0d59c11db62d482ef90 100644 --- a/src/QmlControls/QGCColoredImage.qml +++ b/src/QmlControls/QGCColoredImage.qml @@ -1,6 +1,6 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index 1a7402167bcdb7ac8cbbf33e2a2c4bfe5fe073f5..bd9cf296739ca509a4b19417767ef9e4883a3345 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -1,7 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QtQuick.Controls.Private 1.0 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCFlickable.qml b/src/QmlControls/QGCFlickable.qml index c3a7dfdd5b5e988afaa9b9d538547fd2b48cf4d0..b7ed79d53b82f1e120bb2b2b6a7a21db47d83df6 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 e5a4fc429b996135cfefc20a3bb39bce5209e1eb..35b05c28be7ebe434be90d41133530c9b2886502 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 c20a832865ca864aa3dfb2582290a38eaaf10437..4365d1bd6fbe48de3a2089bf22494e5a4d4f3f6c 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 60217970c117981a59c2882b5e245d351a1c208e..b9570c5c3ac352d22ded31b5770356f9edc1120f 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 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCLabel.qml b/src/QmlControls/QGCLabel.qml index 86ab756be34b78fac0cc8983ae9f735f5aa76419..56b00aaed9be60741870eafa1e886d63feb30bd1 100644 --- a/src/QmlControls/QGCLabel.qml +++ b/src/QmlControls/QGCLabel.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCListView.qml b/src/QmlControls/QGCListView.qml index 3c5205a9eacaf2de079e9363f3ab858cbc5c6bf0..4f5a447d82a02569372626ff7b619c824be860f4 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 ebc49222c884341862d7748c23486f5dfa15780e..8f243f1d74839eeabe139438435169bbc6542ecc 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 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCMobileFileOpenDialog.qml b/src/QmlControls/QGCMobileFileOpenDialog.qml index 6577840424d3f55fb1be77ad9225f8d134e65ebc..a2d9b0f694c0a24dcc6ac97c69d9bbf5edf47687 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/QGCMobileFileSaveDialog.qml b/src/QmlControls/QGCMobileFileSaveDialog.qml index 06abfda2bf900c854ece0b03439e7ce7e68a8134..654a35443fa1804c6c4dbfdc6d8d9a9b2310dd2a 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/QGCMovableItem.qml b/src/QmlControls/QGCMovableItem.qml index afffce8a4f7973505344959b0ae020f79d351329..8f683ae5141d8b57b0f905cf8924bdf22d849436 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 1.4 import QGroundControl.ScreenTools 1.0 // This item can be dragged around within its parent. diff --git a/src/QmlControls/QGCPipable.qml b/src/QmlControls/QGCPipable.qml index ff6937d87786332e498fffd82ee9c1b9f6d0a7e3..a8d7161563c9d0a434ac62a601cadc1a876c384b 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 1.4 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCRadioButton.qml b/src/QmlControls/QGCRadioButton.qml index cfcb5072c873e0540ca1efefed5b4ec06d338793..82578fac43afbdc7a89a5f62adf95c52848268c6 100644 --- a/src/QmlControls/QGCRadioButton.qml +++ b/src/QmlControls/QGCRadioButton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCSlider.qml b/src/QmlControls/QGCSlider.qml index d08303982d5c862dd151ab2e9a7619a6ed6d9c1e..6da123cef8f06b6feff3dc2682ac77031fb5e290 100644 --- a/src/QmlControls/QGCSlider.qml +++ b/src/QmlControls/QGCSlider.qml @@ -7,10 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QtQuick.Controls.Private 1.0 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index 8b5497e905879ee1a466bde6267596e8899939cc..540e8fd548b0b771b371123e4048b51d81489da5 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -1,7 +1,7 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Layouts 1.3 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QGCToolBarButton.qml b/src/QmlControls/QGCToolBarButton.qml index f7d6c8ac9d2c149eafe7cd12f049be1eb2f91b51..ad3dbee22dd3133a85b5f3ec511e5a2d84fc3563 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 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCView.qml b/src/QmlControls/QGCView.qml index 3f7daa123d1e17abbde71a520f28a5797010b9e1..e83b042c1c772e24a18c2ece05002362651c968b 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QGCViewDialog.qml b/src/QmlControls/QGCViewDialog.qml index bd164d36490a50d57ff44a2a9c7a7019c8397473..2af33e4aebea460b632075ce1b685428c5cfce8a 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 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCViewMessage.qml b/src/QmlControls/QGCViewMessage.qml index 4521c403ff380b7f4b89764428a58881ef21a30f..0e9ae00c5ad03aacd2956e81309d84a6045a21c1 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 1.4 import QGroundControl.Controls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/QGCViewPanel.qml b/src/QmlControls/QGCViewPanel.qml index 6e19b4443545c413c63a0e32e00bafe77e9ba7ba..51eb109a64e92a0d7e17045d5cf9d0c88dcef9b2 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 1.4 import QGroundControl.Palette 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QmlTest.qml b/src/QmlControls/QmlTest.qml index a6a461ba2c1b44efa01fcd5f68b748ae8ef88349..9970976bb59bd53424e14c794fcf3c546669ca3c 100644 --- a/src/QmlControls/QmlTest.qml +++ b/src/QmlControls/QmlTest.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/RCChannelMonitor.qml b/src/QmlControls/RCChannelMonitor.qml index 1f0acf02aa5c93917784c3a6341528307ba6fb3b..72f79617300a343ac24d53e99582437d47792c3a 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/QmlControls/RoundButton.qml b/src/QmlControls/RoundButton.qml index 498b7bdb1eadc3ebd89e78c9305078dbfe77a0b9..25131881e8db3664e243e1b877a123500c81d53f 100644 --- a/src/QmlControls/RoundButton.qml +++ b/src/QmlControls/RoundButton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.4 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index 0d2d2a27f1aff60e1feea92e8368c7c85770d166..4147df26541ec0aa701578cd6f98205eb4277748 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 1.4 import QtQuick.Window 2.2 import QGroundControl 1.0 diff --git a/src/QmlControls/SliderSwitch.qml b/src/QmlControls/SliderSwitch.qml index 7da6fd9340132c7fa4d43b086b4bd575d1fbd7d1..0d6d59d258174306df6d6f573615494a0cd3ba6b 100644 --- a/src/QmlControls/SliderSwitch.qml +++ b/src/QmlControls/SliderSwitch.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml index 6698d27f1fd852760ba2bffe346306a4cecf8276..47211badf5014888712010e66bbf6b047cc50c91 100644 --- a/src/QmlControls/SubMenuButton.qml +++ b/src/QmlControls/SubMenuButton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml index 0df07900f9996c583ed29054e225714acffa6926..dbd5e98ea05cc0c56b5d292de622de3c61f9c6da 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 1.4 import QGroundControl.ScreenTools 1.0 import QGroundControl.Palette 1.0 diff --git a/src/QmlControls/VehicleRotationCal.qml b/src/QmlControls/VehicleRotationCal.qml index f399fa7554ff24be13d3d2bc5e43b9cca1f3a3aa..350fd5ee31194a70f9682f60b570995ff9e127e9 100644 --- a/src/QmlControls/VehicleRotationCal.qml +++ b/src/QmlControls/VehicleRotationCal.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/VehicleSummaryRow.qml b/src/QmlControls/VehicleSummaryRow.qml index cc2a035fb947c55fd4c912d3f7ba7d324d465c95..0e0e29078cb24079beb5465b96e843140ee1b677 100644 --- a/src/QmlControls/VehicleSummaryRow.qml +++ b/src/QmlControls/VehicleSummaryRow.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 Row { property string labelText: "Label" diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index 985afec75452171ae0d30eaba22e507885ec307f..808ba02b4e5c81550c25eef63a01844cc494b948 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -7,12 +7,12 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QtQuick.Dialogs 1.1 -import QtQuick.Layouts 1.2 -import QtLocation 5.5 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Dialogs 1.2 +import QtQuick.Layouts 1.3 +import QtLocation 5.6 import QtPositioning 5.5 import QGroundControl 1.0 diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index 8ab41ccf210cdde6fdc97423ccd7cb95b2162b75..372fff58d14ccb63ef755cc28b9869712013882c 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index feb04bba889072566ec8629aa594505ef50de3c8..30234cd7d2bfad9e1e8af96e6ff055304cf5822c 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/VehicleSetup/PX4FlowSensor.qml b/src/VehicleSetup/PX4FlowSensor.qml index e568a25110667311fa6b2ea2534d626f9539e206..a28962dd68da8a1c16e7c9234705f30761544340 100644 --- a/src/VehicleSetup/PX4FlowSensor.qml +++ b/src/VehicleSetup/PX4FlowSensor.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/VehicleSetup/SetupParameterEditor.qml b/src/VehicleSetup/SetupParameterEditor.qml index 9f1b2008fef3f97933e19c95d7e0eb12892929b3..bd1bdafa161a5971446aaaccd941094f7708295a 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 1.4 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml index ac1156397cb78ccee0f1f832a597d2e21b20ae6a..5ca18bb532ca7316c6790dd3c5ed032b2b9fbc48 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 1.4 import QGroundControl 1.0 import QGroundControl.AutoPilotPlugin 1.0 diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index 25579a140f99206b3b1ee8c25ab80e8a4c5dcc70..27b7eb7e850855d18b692d6bb22816119f5eccbc 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/ViewWidgets/CustomCommandWidget.qml b/src/ViewWidgets/CustomCommandWidget.qml index 936cac987c1a050a3aecd65b2e39b9ab64f3c8d7..af49f6352a57c51ac7f7fc089b116f0adb02fdde 100644 --- a/src/ViewWidgets/CustomCommandWidget.qml +++ b/src/ViewWidgets/CustomCommandWidget.qml @@ -11,9 +11,9 @@ /// @file /// @author Don Gagne -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QGroundControl.Palette 1.0 diff --git a/src/ViewWidgets/ViewWidget.qml b/src/ViewWidgets/ViewWidget.qml index bacf12c965110e5062e3211cc1edeec8e77a16d0..16124cfa70832b3a19696e32a551259ef66af888 100644 --- a/src/ViewWidgets/ViewWidget.qml +++ b/src/ViewWidgets/ViewWidget.qml @@ -1,6 +1,6 @@ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.Palette 1.0 import QGroundControl.Controllers 1.0 diff --git a/src/test.qml b/src/test.qml index 5a24d5d340cec376426d24da8fede6af604469d2..017b53bffd4fa05344ab70233b5a96c64114f38a 100644 --- a/src/test.qml +++ b/src/test.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QGroundControl.FactControls 1.0 import QGroundControl.Palette 1.0 diff --git a/src/ui/AppSettings.qml b/src/ui/AppSettings.qml index 4b161474d03682ed13867078311e623f3d946b32..505e7aae7debf0383500b5296ce2717f9128ef46 100644 --- a/src/ui/AppSettings.qml +++ b/src/ui/AppSettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtPositioning 5.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/ui/MainWindowHybrid.qml b/src/ui/MainWindowHybrid.qml index 1c27d9690025a0334b2279d7d83acf2599bd490e..011412f91923cec28edda2a996c665feee848847 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 1.4 import QtQuick.Dialogs 1.2 import QGroundControl 1.0 diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml index 0276d40550a9d298d10ba4d7c1de14d20cbb6bb0..2768a0af49436ec669fafb550ac0d59117eb8d2c 100644 --- a/src/ui/MainWindowInner.qml +++ b/src/ui/MainWindowInner.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 -import QtPositioning 5.2 +import QtPositioning 5.5 import QGroundControl 1.0 import QGroundControl.Palette 1.0 diff --git a/src/ui/MainWindowNative.qml b/src/ui/MainWindowNative.qml index a4c8a5603dceffe58a6dc6712881a427e94dd0c7..ded0dce50b6ced243505bd3a67a667941539dffd 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 9cc61e6970b50e34018e4d2b7967900db09c62c7..c111acbb2d138aa58383723892e9ef22df07d285 100644 --- a/src/ui/preferences/BluetoothSettings.qml +++ b/src/ui/preferences/BluetoothSettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtQuick.Dialogs 1.1 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/DebugWindow.qml b/src/ui/preferences/DebugWindow.qml index 619eda29f85a2274a0cc0889e782d2bf6f4561ce..3e8ddb6da24107f0aa2eb3388747ba208e5846d2 100644 --- a/src/ui/preferences/DebugWindow.qml +++ b/src/ui/preferences/DebugWindow.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index 4506b9174cbbbb677b6defdebe9f48430d380c6e..d80dc44397dfcc4b011e00b7621472968f6061c8 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -8,12 +8,12 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QtQuick.Dialogs 1.1 -import QtMultimedia 5.5 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Dialogs 1.2 +import QtMultimedia 5.8 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/ui/preferences/LinkSettings.qml b/src/ui/preferences/LinkSettings.qml index cd4d75be08845dd8082c9def1135b00c59704e92..cb0a234ab2e7ffc1d4582df263261aab0e02822f 100644 --- a/src/ui/preferences/LinkSettings.qml +++ b/src/ui/preferences/LinkSettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtQuick.Dialogs 1.1 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/LogReplaySettings.qml b/src/ui/preferences/LogReplaySettings.qml index 27e18cd02895932f54118add7f63419fa1c90a98..511c8b4312b75e92e68942d6b5068f5998e78317 100644 --- a/src/ui/preferences/LogReplaySettings.qml +++ b/src/ui/preferences/LogReplaySettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtQuick.Dialogs 1.1 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/MavlinkSettings.qml b/src/ui/preferences/MavlinkSettings.qml index 83ac9ac8c2e3edc35e53342dbb05a8586a3dbb26..f52ab0fee97400392fbd4ebe31ff22dddd1877a2 100644 --- a/src/ui/preferences/MavlinkSettings.qml +++ b/src/ui/preferences/MavlinkSettings.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import QtQuick.Dialogs 1.1 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.FactSystem 1.0 diff --git a/src/ui/preferences/MockLink.qml b/src/ui/preferences/MockLink.qml index 5c5e476fd4813e1571fafd6f551c16ad25e1761a..c850ae2ddbbdc39f5c2624bebadd1721aba24544 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 1800d12a3445bc118d5819a1f0b247f98aa90ef3..47d6d35c831d0375544270a3e779cad293e13797 100644 --- a/src/ui/preferences/MockLinkSettings.qml +++ b/src/ui/preferences/MockLinkSettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/SerialSettings.qml b/src/ui/preferences/SerialSettings.qml index c7c09526a72e9188d8cb2b3d79c933e7d0a960e5..afb3194183ddd64710bb00486280763bf50a15a8 100644 --- a/src/ui/preferences/SerialSettings.qml +++ b/src/ui/preferences/SerialSettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtQuick.Dialogs 1.1 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/TcpSettings.qml b/src/ui/preferences/TcpSettings.qml index f523e6313ad937edfb83f367d1b4a63da020f39e..9b040b3ed68ddf29c83b57e009cd55d8722787ea 100644 --- a/src/ui/preferences/TcpSettings.qml +++ b/src/ui/preferences/TcpSettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtQuick.Dialogs 1.1 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/preferences/UdpSettings.qml b/src/ui/preferences/UdpSettings.qml index 323eb015eb70954eec50e8e29132a1f2321354ae..5493031ea480e3126e2bc873b764465a583d19c8 100644 --- a/src/ui/preferences/UdpSettings.qml +++ b/src/ui/preferences/UdpSettings.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtQuick.Dialogs 1.1 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/BatteryIndicator.qml b/src/ui/toolbar/BatteryIndicator.qml index 344c7714a0559fd888c5df48bbf1db8cbfc43354..0a6242ab430741559265b22b4f21e202bc61054d 100644 --- a/src/ui/toolbar/BatteryIndicator.qml +++ b/src/ui/toolbar/BatteryIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/GPSIndicator.qml b/src/ui/toolbar/GPSIndicator.qml index d73479069f19b09b5d551d35cea5b56e3e06f9e2..0920867fc448dd1bcf6c643cf79f08919057a8fc 100644 --- a/src/ui/toolbar/GPSIndicator.qml +++ b/src/ui/toolbar/GPSIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index 8f656ceea56589625bc4ba1fd051f29f7db2a10d..058699eb0525c57408c07ffaa926a19e59e141c8 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -7,9 +7,9 @@ * ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Layouts 1.2 -import QtQuick.Controls 1.2 +import QtQuick 2.7 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 1.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml index 16caea17a6076389c8bb0545ee92a245a8e8df01..1a8c1e38921ef5964c4036bbf85436c76ee68cad 100644 --- a/src/ui/toolbar/MainToolBarIndicators.qml +++ b/src/ui/toolbar/MainToolBarIndicators.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MessageIndicator.qml b/src/ui/toolbar/MessageIndicator.qml index aecd246149bd9c15a55fb9d045b337e5c886327d..186d059a7793c10a1402a87f5bcf2093b0555081 100644 --- a/src/ui/toolbar/MessageIndicator.qml +++ b/src/ui/toolbar/MessageIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/ModeIndicator.qml b/src/ui/toolbar/ModeIndicator.qml index c8aedaa873c882d954e6c9aa534976126a4f3d5b..b86c2b4cf064ec6dcef06ca9c35b128ebb7d7a59 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 1.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/RCRSSIIndicator.qml b/src/ui/toolbar/RCRSSIIndicator.qml index 64471abf26ff99419c40a60c34b1e6c744e46412..bed0eddfd939b632b361ce0c6e96920f2581d51b 100644 --- a/src/ui/toolbar/RCRSSIIndicator.qml +++ b/src/ui/toolbar/RCRSSIIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/SignalStrength.qml b/src/ui/toolbar/SignalStrength.qml index 8b0932033b9ed81eeea386b1edc1c4c888d1c3be..ada38752dddb16e53fcdfaa1abd43fd2d8dbc073 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 145fa6519c3165c73c8a7a14941842c28506363b..bed7cd970c1f9e6156c7373192266546b8cade38 100644 --- a/src/ui/toolbar/TelemetryRSSIIndicator.qml +++ b/src/ui/toolbar/TelemetryRSSIIndicator.qml @@ -8,9 +8,9 @@ ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.7 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 import QGroundControl 1.0 import QGroundControl.Controls 1.0