From 2d6021d8a2d7dd61a3a5e269497be74c12775d3e Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 2 Mar 2017 19:43:41 -0800 Subject: [PATCH] Update import QtLocation --- src/FlightDisplay/FlightDisplayView.qml | 2 +- src/FlightDisplay/FlightDisplayViewMap.qml | 2 +- src/FlightDisplay/FlightDisplayViewWidgets.qml | 2 +- src/FlightMap/FlightMap.qml | 2 +- src/FlightMap/MapItems/MissionItemIndicator.qml | 2 +- src/FlightMap/MapItems/MissionItemIndicatorDrag.qml | 2 +- src/FlightMap/MapItems/MissionItemView.qml | 2 +- src/FlightMap/MapItems/MissionLineView.qml | 2 +- src/FlightMap/MapItems/PolygonEditor.qml | 4 ++-- src/FlightMap/MapItems/VehicleMapItem.qml | 2 +- src/MissionEditor/FWLandingPatternMapVisual.qml | 2 +- src/MissionEditor/MissionEditor.qml | 2 +- src/MissionEditor/MissionItemMapVisual.qml | 2 +- src/MissionEditor/SimpleItemMapVisual.qml | 2 +- src/MissionEditor/SurveyMapVisual.qml | 2 +- src/QtLocationPlugin/QMLControl/OfflineMap.qml | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 8e723d1caf..9fbff62835 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -12,7 +12,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.2 import QtMultimedia 5.5 diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml index 0f771c55f4..6507c32a05 100644 --- a/src/FlightDisplay/FlightDisplayViewMap.qml +++ b/src/FlightDisplay/FlightDisplayViewMap.qml @@ -10,7 +10,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.2 import QGroundControl 1.0 diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index fa18ef5529..e4dd7795c6 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -12,7 +12,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.2 import QGroundControl 1.0 diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml index 3d2c633de3..3295c43e50 100644 --- a/src/FlightMap/FlightMap.qml +++ b/src/FlightMap/FlightMap.qml @@ -16,7 +16,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.3 import QGroundControl 1.0 diff --git a/src/FlightMap/MapItems/MissionItemIndicator.qml b/src/FlightMap/MapItems/MissionItemIndicator.qml index 114458d9fa..016891b8fe 100644 --- a/src/FlightMap/MapItems/MissionItemIndicator.qml +++ b/src/FlightMap/MapItems/MissionItemIndicator.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtLocation 5.3 +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 00c1066250..cfda94fda0 100644 --- a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml +++ b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtLocation 5.3 +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 e879ef12bf..f128669e15 100644 --- a/src/FlightMap/MapItems/MissionItemView.qml +++ b/src/FlightMap/MapItems/MissionItemView.qml @@ -11,7 +11,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.3 import QGroundControl 1.0 diff --git a/src/FlightMap/MapItems/MissionLineView.qml b/src/FlightMap/MapItems/MissionLineView.qml index 432ce3f055..1e879afbe5 100644 --- a/src/FlightMap/MapItems/MissionLineView.qml +++ b/src/FlightMap/MapItems/MissionLineView.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.3 import QGroundControl 1.0 diff --git a/src/FlightMap/MapItems/PolygonEditor.qml b/src/FlightMap/MapItems/PolygonEditor.qml index 8b1c5341b5..a3cba825cb 100644 --- a/src/FlightMap/MapItems/PolygonEditor.qml +++ b/src/FlightMap/MapItems/PolygonEditor.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtLocation 5.3 +import QtLocation 5.6 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 @@ -70,7 +70,7 @@ Item { for (var i=0; i import QtQuick 2.7 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.3 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/FWLandingPatternMapVisual.qml b/src/MissionEditor/FWLandingPatternMapVisual.qml index 8aa9b1ed62..23f331b9b1 100644 --- a/src/MissionEditor/FWLandingPatternMapVisual.qml +++ b/src/MissionEditor/FWLandingPatternMapVisual.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.2 import QGroundControl 1.0 diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index 7f61bbc5a8..e45449d653 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -11,7 +11,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.3 import QtQuick.Layouts 1.2 diff --git a/src/MissionEditor/MissionItemMapVisual.qml b/src/MissionEditor/MissionItemMapVisual.qml index 71135759a3..5f57877fab 100644 --- a/src/MissionEditor/MissionItemMapVisual.qml +++ b/src/MissionEditor/MissionItemMapVisual.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.2 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionEditor/SimpleItemMapVisual.qml b/src/MissionEditor/SimpleItemMapVisual.qml index 8522362bce..60ff1cc703 100644 --- a/src/MissionEditor/SimpleItemMapVisual.qml +++ b/src/MissionEditor/SimpleItemMapVisual.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.2 import QGroundControl 1.0 diff --git a/src/MissionEditor/SurveyMapVisual.qml b/src/MissionEditor/SurveyMapVisual.qml index 393affcaab..9c0b256d95 100644 --- a/src/MissionEditor/SurveyMapVisual.qml +++ b/src/MissionEditor/SurveyMapVisual.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import QtLocation 5.3 +import QtLocation 5.6 import QtPositioning 5.2 import QGroundControl 1.0 diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index 5d85a633ec..5574e81d49 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -12,7 +12,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.1 import QtQuick.Layouts 1.2 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 import QGroundControl 1.0 -- GitLab