Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I48858c7a8b57b1ad2bd8aa5bea578dd12113b24b

12 files changed, 12 insertions, 12 deletions

diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml
index 7794cac4..34f109d1 100644
--- a/tests/auto/declarative_ui/tst_map.qml
+++ b/tests/auto/declarative_ui/tst_map.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 import QtPositioning 5.5
 
 Item {
diff --git a/tests/auto/declarative_ui/tst_map_coordinateanimation.qml b/tests/auto/declarative_ui/tst_map_coordinateanimation.qml
index b297e619..ec8042fd 100644
--- a/tests/auto/declarative_ui/tst_map_coordinateanimation.qml
+++ b/tests/auto/declarative_ui/tst_map_coordinateanimation.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 import QtPositioning 5.5
 
 Item {
diff --git a/tests/auto/declarative_ui/tst_map_error.qml b/tests/auto/declarative_ui/tst_map_error.qml
index 6a70cade..68752f11 100644
--- a/tests/auto/declarative_ui/tst_map_error.qml
+++ b/tests/auto/declarative_ui/tst_map_error.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 import QtPositioning 5.5
 
 Item {
diff --git a/tests/auto/declarative_ui/tst_map_flick.qml b/tests/auto/declarative_ui/tst_map_flick.qml
index 04814566..526cbb6f 100644
--- a/tests/auto/declarative_ui/tst_map_flick.qml
+++ b/tests/auto/declarative_ui/tst_map_flick.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.5
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 import QtPositioning 5.5
 
 Item {
diff --git a/tests/auto/declarative_ui/tst_map_item.qml b/tests/auto/declarative_ui/tst_map_item.qml
index b0615f4f..32de8efd 100644
--- a/tests/auto/declarative_ui/tst_map_item.qml
+++ b/tests/auto/declarative_ui/tst_map_item.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 import QtPositioning 5.5
 
     /*
diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml
index f6fcca4b..b4468301 100644
--- a/tests/auto/declarative_ui/tst_map_item_details.qml
+++ b/tests/auto/declarative_ui/tst_map_item_details.qml
@@ -34,7 +34,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtPositioning 5.5
-import QtLocation 5.5
+import QtLocation 5.6
 
 Item {
     id: page
diff --git a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
index f14cea3a..55fbd348 100644
--- a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
+++ b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 import QtPositioning 5.5
 import QtLocation.Test 5.5
 
diff --git a/tests/auto/declarative_ui/tst_map_itemview.qml b/tests/auto/declarative_ui/tst_map_itemview.qml
index 33276198..5fe00d97 100644
--- a/tests/auto/declarative_ui/tst_map_itemview.qml
+++ b/tests/auto/declarative_ui/tst_map_itemview.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 import QtPositioning 5.5
 import QtLocation.Test 5.5
 
diff --git a/tests/auto/declarative_ui/tst_map_keepgrab.qml b/tests/auto/declarative_ui/tst_map_keepgrab.qml
index cf620676..645946c3 100644
--- a/tests/auto/declarative_ui/tst_map_keepgrab.qml
+++ b/tests/auto/declarative_ui/tst_map_keepgrab.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.5
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 import QtPositioning 5.5
 
 Item {
diff --git a/tests/auto/declarative_ui/tst_map_maptype.qml b/tests/auto/declarative_ui/tst_map_maptype.qml
index a20241fc..d96ee60e 100644
--- a/tests/auto/declarative_ui/tst_map_maptype.qml
+++ b/tests/auto/declarative_ui/tst_map_maptype.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 
 Item{
     id: page
diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml
index aa595a28..fe02f81d 100644
--- a/tests/auto/declarative_ui/tst_map_mouse.qml
+++ b/tests/auto/declarative_ui/tst_map_mouse.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.5
+import QtLocation 5.6
 import QtPositioning 5.5
 
     /*
diff --git a/tests/auto/qmlinterface/data/TestPlace.qml b/tests/auto/qmlinterface/data/TestPlace.qml
index 33e54104..e2571cb4 100644
--- a/tests/auto/qmlinterface/data/TestPlace.qml
+++ b/tests/auto/qmlinterface/data/TestPlace.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtLocation 5.5
+import QtLocation 5.6
 
 Place {
     name: "Test Place"