summaryrefslogtreecommitdiff
path: root/examples/location/mapviewer/map
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-10-16 09:22:15 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-10-16 09:22:15 +0200
commitf87ba0409856a678e8a940b70f7452c3a1b730c3 (patch)
tree8c804075fe23ba1bcf8fe5c578780597cbfa4d4f /examples/location/mapviewer/map
parentb4a065d70e86405bc658b54fffad7c69a12f27aa (diff)
parentcd543e15c12c838eb0b30fc1d656bdebda13b324 (diff)
downloadqtlocation-f87ba0409856a678e8a940b70f7452c3a1b730c3.tar.gz
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I48858c7a8b57b1ad2bd8aa5bea578dd12113b24b
Diffstat (limited to 'examples/location/mapviewer/map')
-rw-r--r--examples/location/mapviewer/map/CircleItem.qml2
-rw-r--r--examples/location/mapviewer/map/ImageItem.qml2
-rw-r--r--examples/location/mapviewer/map/MapComponent.qml2
-rw-r--r--examples/location/mapviewer/map/Marker.qml2
-rw-r--r--examples/location/mapviewer/map/MiniMap.qml2
-rw-r--r--examples/location/mapviewer/map/PolygonItem.qml2
-rw-r--r--examples/location/mapviewer/map/PolylineItem.qml2
-rw-r--r--examples/location/mapviewer/map/RectangleItem.qml2
8 files changed, 8 insertions, 8 deletions
diff --git a/examples/location/mapviewer/map/CircleItem.qml b/examples/location/mapviewer/map/CircleItem.qml
index 3f663149..3b32ba51 100644
--- a/examples/location/mapviewer/map/CircleItem.qml
+++ b/examples/location/mapviewer/map/CircleItem.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.5
-import QtLocation 5.5
+import QtLocation 5.6
//TODO: remove/refactor me when items are integrated
diff --git a/examples/location/mapviewer/map/ImageItem.qml b/examples/location/mapviewer/map/ImageItem.qml
index 27456ed9..3bf4dfe2 100644
--- a/examples/location/mapviewer/map/ImageItem.qml
+++ b/examples/location/mapviewer/map/ImageItem.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.5;
-import QtLocation 5.5
+import QtLocation 5.6
MapQuickItem { //to be used inside MapComponent only
id: imageItem
diff --git a/examples/location/mapviewer/map/MapComponent.qml b/examples/location/mapviewer/map/MapComponent.qml
index 0857804b..ece4798b 100644
--- a/examples/location/mapviewer/map/MapComponent.qml
+++ b/examples/location/mapviewer/map/MapComponent.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.5
import QtQuick.Controls 1.4
-import QtLocation 5.5
+import QtLocation 5.6
import QtPositioning 5.5
import "../helper.js" as Helper
diff --git a/examples/location/mapviewer/map/Marker.qml b/examples/location/mapviewer/map/Marker.qml
index a8851a4c..3c0ed170 100644
--- a/examples/location/mapviewer/map/Marker.qml
+++ b/examples/location/mapviewer/map/Marker.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.5;
-import QtLocation 5.5
+import QtLocation 5.6
//! [mqi-top]
MapQuickItem {
diff --git a/examples/location/mapviewer/map/MiniMap.qml b/examples/location/mapviewer/map/MiniMap.qml
index 35996063..43af605d 100644
--- a/examples/location/mapviewer/map/MiniMap.qml
+++ b/examples/location/mapviewer/map/MiniMap.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.5
-import QtLocation 5.5
+import QtLocation 5.6
Rectangle{
id: miniMapRect
diff --git a/examples/location/mapviewer/map/PolygonItem.qml b/examples/location/mapviewer/map/PolygonItem.qml
index b28ff22c..cab4e6c0 100644
--- a/examples/location/mapviewer/map/PolygonItem.qml
+++ b/examples/location/mapviewer/map/PolygonItem.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.5
-import QtLocation 5.5
+import QtLocation 5.6
//TODO: remove me when items are integrated
diff --git a/examples/location/mapviewer/map/PolylineItem.qml b/examples/location/mapviewer/map/PolylineItem.qml
index 4861e5af..c27d8b7a 100644
--- a/examples/location/mapviewer/map/PolylineItem.qml
+++ b/examples/location/mapviewer/map/PolylineItem.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.5
-import QtLocation 5.5
+import QtLocation 5.6
//TODO: remove/refactor me when items are integrated
diff --git a/examples/location/mapviewer/map/RectangleItem.qml b/examples/location/mapviewer/map/RectangleItem.qml
index 57b0a483..8369c903 100644
--- a/examples/location/mapviewer/map/RectangleItem.qml
+++ b/examples/location/mapviewer/map/RectangleItem.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.5
-import QtLocation 5.5
+import QtLocation 5.6
MapRectangle {
id: mapRectangle