Merge branch 'stable' into dev

Conflicts:
	src/imports/location/qdeclarativegeomap.cpp
	src/imports/location/qdeclarativegeoroute.cpp
	src/imports/location/qdeclarativegeoroutemodel.cpp
	src/imports/location/qdeclarativegeoroutesegment.cpp
	src/imports/location/qdeclarativepolygonmapitem.cpp
	src/imports/location/qdeclarativepolylinemapitem.cpp
	src/imports/positioning/positioning.cpp

Change-Id: Ieaa5f567d2144d0267e7eef5bd75bde7e0079fbe

15 files changed, 17 insertions, 16 deletions

diff --git a/tests/auto/declarative_core/tst_address.qml b/tests/auto/declarative_core/tst_address.qml
index 2348e345..1ef968aa 100644
--- a/tests/auto/declarative_core/tst_address.qml
+++ b/tests/auto/declarative_core/tst_address.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtTest 1.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 
 TestCase {
     id: testCase
diff --git a/tests/auto/declarative_core/tst_coordinate.qml b/tests/auto/declarative_core/tst_coordinate.qml
index b704176e..1541be39 100644
--- a/tests/auto/declarative_core/tst_coordinate.qml
+++ b/tests/auto/declarative_core/tst_coordinate.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 
 Item {
     id: item
diff --git a/tests/auto/declarative_core/tst_map_routing.qml b/tests/auto/declarative_core/tst_map_routing.qml
index 056026e7..bc5962b9 100644
--- a/tests/auto/declarative_core/tst_map_routing.qml
+++ b/tests/auto/declarative_core/tst_map_routing.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 
 Item {
     Plugin { id: testPlugin; name: "qmlgeo.test.plugin"; allowExperimental: true }
diff --git a/tests/auto/declarative_core/tst_place.qml b/tests/auto/declarative_core/tst_place.qml
index b8ed6b6b..de73ab88 100644
--- a/tests/auto/declarative_core/tst_place.qml
+++ b/tests/auto/declarative_core/tst_place.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 import "utils.js" as Utils
 
 TestCase {
@@ -403,7 +403,7 @@ TestCase {
     }
 
     function test_location() {
-        var location = Qt.createQmlObject('import QtPositioning 5.0; Location { coordinate: QtPositioning.coordinate(10.0, 20.0) }', testCase, "Location1");
+        var location = Qt.createQmlObject('import QtPositioning 5.2; Location { coordinate: QtPositioning.coordinate(10.0, 20.0) }', testCase, "Location1");
 
         var signalSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy");
         signalSpy.target = testPlace;
diff --git a/tests/auto/declarative_core/tst_placesearchmodel.qml b/tests/auto/declarative_core/tst_placesearchmodel.qml
index 3af24adc..fba80815 100644
--- a/tests/auto/declarative_core/tst_placesearchmodel.qml
+++ b/tests/auto/declarative_core/tst_placesearchmodel.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 import "utils.js" as Utils
 
 TestCase {
diff --git a/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml b/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml
index 0222eecc..35d61c2f 100644
--- a/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml
+++ b/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 import "utils.js" as Utils
 
 TestCase {
diff --git a/tests/auto/declarative_core/tst_position.qml b/tests/auto/declarative_core/tst_position.qml
index 65172d62..8bb42960 100644
--- a/tests/auto/declarative_core/tst_position.qml
+++ b/tests/auto/declarative_core/tst_position.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 
 TestCase {
     id: testCase
diff --git a/tests/auto/declarative_core/tst_positionsource.qml b/tests/auto/declarative_core/tst_positionsource.qml
index 82c25c52..e11408b6 100644
--- a/tests/auto/declarative_core/tst_positionsource.qml
+++ b/tests/auto/declarative_core/tst_positionsource.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 
 TestCase {
     id: testCase
@@ -77,6 +77,7 @@ TestCase {
     }
 
     function test_inactive() {
+        defaultSourceSpy.clear();
         compare(defaultSourceSpy.count, 0);
         wait(1000);
         compare(defaultSourceSpy.count, 0);
diff --git a/tests/auto/declarative_geoshape/tst_locationsingleton.qml b/tests/auto/declarative_geoshape/tst_locationsingleton.qml
index 58682721..37210cb1 100644
--- a/tests/auto/declarative_geoshape/tst_locationsingleton.qml
+++ b/tests/auto/declarative_geoshape/tst_locationsingleton.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 
 Item {
     id: testCase
diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml
index 38be06b5..52ad3cbb 100644
--- a/tests/auto/declarative_ui/tst_map.qml
+++ b/tests/auto/declarative_ui/tst_map.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 
 Item {
     width:100
diff --git a/tests/auto/declarative_ui/tst_map_geocoding.qml b/tests/auto/declarative_ui/tst_map_geocoding.qml
index a61c993b..5d6b33a8 100644
--- a/tests/auto/declarative_ui/tst_map_geocoding.qml
+++ b/tests/auto/declarative_ui/tst_map_geocoding.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 
 Item {
     Plugin { id: nokiaPlugin; name: "qmlgeo.test.plugin"}
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 4415541c..ff3d224c 100644
--- a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
+++ b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 import QtLocation.test 5.0
 
     /*
diff --git a/tests/auto/declarative_ui/tst_map_itemview.qml b/tests/auto/declarative_ui/tst_map_itemview.qml
index 27b3c660..a24bd8c7 100644
--- a/tests/auto/declarative_ui/tst_map_itemview.qml
+++ b/tests/auto/declarative_ui/tst_map_itemview.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 import QtLocation.test 5.0
 
 Item {
diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml
index 87f5638b..0f6e34da 100644
--- a/tests/auto/declarative_ui/tst_map_mouse.qml
+++ b/tests/auto/declarative_ui/tst_map_mouse.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 import QtLocation.test 5.0
 
     /*
diff --git a/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml b/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml
index 8ef97b43..965da57c 100644
--- a/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml
+++ b/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
-import QtPositioning 5.0
+import QtPositioning 5.2
 import QtLocation.test 5.0
 
 Item {