Split QtLocation into QtPositioning and QtLocation

QtPositioning is not dependent on any gui component and mostly
covers everything around the retrieval of position information.

QtLocation covers place, map and navigation APIs.

Several documentation issues were fixed during the process.

Change-Id: I98e2a53065549a2fc43f93a75b4f65b5bc884c92
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

51 files changed, 221 insertions, 153 deletions

diff --git a/tests/applications/declarative_map/map3d.qml b/tests/applications/declarative_map/map3d.qml
index 6edbbf09..c9fc4e83 100644
--- a/tests/applications/declarative_map/map3d.qml
+++ b/tests/applications/declarative_map/map3d.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtPositioning 5.0
 import QtLocation 5.0
 import QtLocation.test 5.0
 import "common" as Common
diff --git a/tests/applications/declarative_map/map3d_mousetest.qml b/tests/applications/declarative_map/map3d_mousetest.qml
index 2d1e706c..bd317216 100644
--- a/tests/applications/declarative_map/map3d_mousetest.qml
+++ b/tests/applications/declarative_map/map3d_mousetest.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtPositioning 5.0
 import QtLocation 5.0
 import QtLocation.test 5.0
 import "common" as Common
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index bf2dbcb7..8e4dae9f 100644
--- a/tests/auto/cmake/cmake.pro
+++ b/tests/auto/cmake/cmake.pro
@@ -3,3 +3,5 @@
 TEMPLATE = subdirs
 
 CONFIG += ctest_testcase
+
+CONFIG+=insignificant_test # QTBUG-33259
diff --git a/tests/auto/declarative_core/tst_address.qml b/tests/auto/declarative_core/tst_address.qml
index c3fc5d28..2348e345 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 QtLocation 5.0
+import QtPositioning 5.0
 
 TestCase {
     id: testCase
diff --git a/tests/auto/declarative_core/tst_coordinate.qml b/tests/auto/declarative_core/tst_coordinate.qml
index a9e205e8..b704176e 100644
--- a/tests/auto/declarative_core/tst_coordinate.qml
+++ b/tests/auto/declarative_core/tst_coordinate.qml
@@ -41,20 +41,74 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.0
+import QtPositioning 5.0
 
 Item {
     id: item
 
-    property variant empty: QtLocation.coordinate()
-    property variant base: QtLocation.coordinate(1.0, 1.0, 5.0)
-    property variant zero: QtLocation.coordinate(0, 0)
-    property variant plusone: QtLocation.coordinate(0, 1)
-    property variant minusone: QtLocation.coordinate(0, -1)
-    property variant north: QtLocation.coordinate(3, 0)
+    property variant empty: QtPositioning.coordinate()
+    property variant base: QtPositioning.coordinate(1.0, 1.0, 5.0)
+    property variant zero: QtPositioning.coordinate(0, 0)
+    property variant plusone: QtPositioning.coordinate(0, 1)
+    property variant minusone: QtPositioning.coordinate(0, -1)
+    property variant north: QtPositioning.coordinate(3, 0)
 
     SignalSpy { id: coordSpy; target: item; signalName: "baseChanged" }
 
+    property variant inside: QtPositioning.coordinate(0.5, 0.5)
+    property variant outside: QtPositioning.coordinate(2, 2)
+    property variant tl: QtPositioning.coordinate(1, 0)
+    property variant br: QtPositioning.coordinate(0, 1)
+    property variant box: QtPositioning.rectangle(tl, br)
+
+
+    Address {
+        id: validTestAddress
+        street: "53 Brandl St"
+        city: "Eight Mile Plains"
+        country: "Australia"
+        countryCode: "AUS"
+    }
+
+    Location {
+        id: testLocation
+        coordinate: inside
+        boundingBox: box
+        address: validTestAddress
+    }
+
+    Location {
+        id: invalidLocation
+    }
+
+    TestCase {
+        name: "GeoLocation"
+
+        function test_Location_complete() {
+            compare (testLocation.coordinate.longitude, inside.longitude)
+            compare (testLocation.coordinate.latitude, inside.latitude)
+
+            compare (testLocation.boundingBox.contains(inside), true)
+            compare (testLocation.boundingBox.contains(outside), false)
+            compare (testLocation.boundingBox.bottomRight.longitude, br.longitude)
+            compare (testLocation.boundingBox.bottomRight.latitude, br.latitude)
+            compare (testLocation.boundingBox.topLeft.longitude, tl.longitude)
+            compare (testLocation.boundingBox.topLeft.latitude, tl.latitude)
+
+            compare (testLocation.address.country, "Australia")
+            compare (testLocation.address.countryCode, "AUS")
+            compare (testLocation.address.city, "Eight Mile Plains")
+            compare (testLocation.address.street, "53 Brandl St")
+        }
+
+        function test_Location_invalid() {
+            compare(invalidLocation.coordinate.isValid, false)
+            compare(invalidLocation.boundingBox.isEmpty, true)
+            compare(invalidLocation.boundingBox.isValid, false)
+            compare(invalidLocation.address.city, "")
+        }
+    }
+
     TestCase {
         name: "Coordinate"
 
diff --git a/tests/auto/declarative_core/tst_geoshape.qml b/tests/auto/declarative_core/tst_geoshape.qml
index c4f9dba4..df03125f 100644
--- a/tests/auto/declarative_core/tst_geoshape.qml
+++ b/tests/auto/declarative_core/tst_geoshape.qml
@@ -41,17 +41,17 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.0
+import QtPositioning 5.0
 
 Item {
     id: testCase
 
-    property variant coordinate1: QtLocation.coordinate(1, 1)
-    property variant coordinate2: QtLocation.coordinate(2, 2)
-    property variant coordinate3: QtLocation.coordinate(80, 80)
+    property variant coordinate1: QtPositioning.coordinate(1, 1)
+    property variant coordinate2: QtPositioning.coordinate(2, 2)
+    property variant coordinate3: QtPositioning.coordinate(80, 80)
 
-    property variant emptyCircle: QtLocation.circle()
-    property variant circle1: QtLocation.circle(coordinate1, 200000)
+    property variant emptyCircle: QtPositioning.circle()
+    property variant circle1: QtPositioning.circle(coordinate1, 200000)
 
     SignalSpy { id: circleChangedSpy; target: testCase; signalName: "emptyCircleChanged" }
 
@@ -84,16 +84,16 @@ Item {
     }
 
     // coordinate unit square
-    property variant bl: QtLocation.coordinate(0, 0)
-    property variant tl: QtLocation.coordinate(1, 0)
-    property variant tr: QtLocation.coordinate(1, 1)
-    property variant br: QtLocation.coordinate(0, 1)
-    property variant ntr: QtLocation.coordinate(3, 3)
+    property variant bl: QtPositioning.coordinate(0, 0)
+    property variant tl: QtPositioning.coordinate(1, 0)
+    property variant tr: QtPositioning.coordinate(1, 1)
+    property variant br: QtPositioning.coordinate(0, 1)
+    property variant ntr: QtPositioning.coordinate(3, 3)
 
-    property variant inside: QtLocation.coordinate(0.5, 0.5)
-    property variant outside: QtLocation.coordinate(2, 2)
+    property variant inside: QtPositioning.coordinate(0.5, 0.5)
+    property variant outside: QtPositioning.coordinate(2, 2)
 
-    property variant box: QtLocation.rectangle(tl, br)
+    property variant box: QtPositioning.rectangle(tl, br)
 
     // C++ auto test exists for basics of bounding box, testing here
     // only added functionality
diff --git a/tests/auto/declarative_core/tst_map_routing.qml b/tests/auto/declarative_core/tst_map_routing.qml
index 5dd24489..056026e7 100644
--- a/tests/auto/declarative_core/tst_map_routing.qml
+++ b/tests/auto/declarative_core/tst_map_routing.qml
@@ -42,16 +42,17 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 
 Item {
     Plugin { id: testPlugin; name: "qmlgeo.test.plugin"; allowExperimental: true }
     Plugin { id: invalidPlugin; name: "invalid"}
 
-    property variant coordinate1: QtLocation.coordinate(51, 0)
-    property variant coordinate2: QtLocation.coordinate(52, 0)
+    property variant coordinate1: QtPositioning.coordinate(51, 0)
+    property variant coordinate2: QtPositioning.coordinate(52, 0)
 
-    property variant boundingBox1: QtLocation.rectangle()
-    property variant boundingBox2: QtLocation.rectangle()
+    property variant boundingBox1: QtPositioning.rectangle()
+    property variant boundingBox2: QtPositioning.rectangle()
 
     Component.onCompleted: {
         boundingBox1.topLeft = coordinate1;
@@ -63,13 +64,13 @@ Item {
         boundingBox2.width = 20;
     }
 
-    property variant bl: QtLocation.coordinate(0, 0)
-    property variant tl: QtLocation.coordinate(1, 0)
-    property variant tr: QtLocation.coordinate(1, 1)
-    property variant br: QtLocation.coordinate(0, 1)
-    property variant ntr: QtLocation.coordinate(3, 3)
+    property variant bl: QtPositioning.coordinate(0, 0)
+    property variant tl: QtPositioning.coordinate(1, 0)
+    property variant tr: QtPositioning.coordinate(1, 1)
+    property variant br: QtPositioning.coordinate(0, 1)
+    property variant ntr: QtPositioning.coordinate(3, 3)
 
-    property variant unitBox: QtLocation.rectangle(tl, br)
+    property variant unitBox: QtPositioning.rectangle(tl, br)
 
     Route {id: emptyRoute}
     TestCase {
@@ -80,9 +81,9 @@ Item {
         // TODO enable when we have map route
         //MapRoute {id: emptyMapRoute}
 
-        property variant emptyBox: QtLocation.rectangle()
+        property variant emptyBox: QtPositioning.rectangle()
 
-        property variant emptyCoordinate: QtLocation.coordinate()
+        property variant emptyCoordinate: QtPositioning.coordinate()
 
         // TODO enable when we have map route
         /*
@@ -487,21 +488,21 @@ Item {
         ]
     }
 
-    property variant rcoordinate1: QtLocation.coordinate(50, 50)
-    property variant rcoordinate2: QtLocation.coordinate(51, 52)
-    property variant rcoordinate3: QtLocation.coordinate(53, 54)
-    property variant rcoordinate4: QtLocation.coordinate(55, 56)
-    property variant rcoordinate5: QtLocation.coordinate(57, 58)
+    property variant rcoordinate1: QtPositioning.coordinate(50, 50)
+    property variant rcoordinate2: QtPositioning.coordinate(51, 52)
+    property variant rcoordinate3: QtPositioning.coordinate(53, 54)
+    property variant rcoordinate4: QtPositioning.coordinate(55, 56)
+    property variant rcoordinate5: QtPositioning.coordinate(57, 58)
 
-    property variant fcoordinate1: QtLocation.coordinate(60, 60)
-    property variant fcoordinate2: QtLocation.coordinate(61, 62)
-    property variant fcoordinate3: QtLocation.coordinate(63, 64)
-    property variant fcoordinate4: QtLocation.coordinate(65, 66)
-    property variant fcoordinate5: QtLocation.coordinate(67, 68)
+    property variant fcoordinate1: QtPositioning.coordinate(60, 60)
+    property variant fcoordinate2: QtPositioning.coordinate(61, 62)
+    property variant fcoordinate3: QtPositioning.coordinate(63, 64)
+    property variant fcoordinate4: QtPositioning.coordinate(65, 66)
+    property variant fcoordinate5: QtPositioning.coordinate(67, 68)
 
-    property variant f2coordinate1: QtLocation.coordinate(60, 60)
-    property variant f2coordinate2: QtLocation.coordinate(61, 62)
-    property variant f2coordinate3: QtLocation.coordinate(63, 64)
+    property variant f2coordinate1: QtPositioning.coordinate(60, 60)
+    property variant f2coordinate2: QtPositioning.coordinate(61, 62)
+    property variant f2coordinate3: QtPositioning.coordinate(63, 64)
 
     RouteQuery {id: routeQuery}
     RouteQuery {
@@ -775,7 +776,7 @@ Item {
         }
 
         function test_route_query_handles_destroyed_qml_objects() {
-            var coordinate = QtLocation.coordinate(11, 52);
+            var coordinate = QtPositioning.coordinate(11, 52);
             routeQuery.addWaypoint(coordinate);
             wait(300);
             routeQuery.clearWaypoints();
diff --git a/tests/auto/declarative_core/tst_place.qml b/tests/auto/declarative_core/tst_place.qml
index 73f1fbfc..b8ed6b6b 100644
--- a/tests/auto/declarative_core/tst_place.qml
+++ b/tests/auto/declarative_core/tst_place.qml
@@ -42,6 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 import "utils.js" as Utils
 
 TestCase {
@@ -92,7 +93,7 @@ TestCase {
             }
 
             boundingBox {
-                center: QtLocation.coordinate(10, 10, 100)
+                center: QtPositioning.coordinate(10, 10, 100)
                 width: 100
                 height: 100
             }
@@ -402,7 +403,7 @@ TestCase {
     }
 
     function test_location() {
-        var location = Qt.createQmlObject('import QtLocation 5.0; Location { coordinate: QtLocation.coordinate(10.0, 20.0) }', testCase, "Location1");
+        var location = Qt.createQmlObject('import QtPositioning 5.0; 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 bb034710..3af24adc 100644
--- a/tests/auto/declarative_core/tst_placesearchmodel.qml
+++ b/tests/auto/declarative_core/tst_placesearchmodel.qml
@@ -42,6 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 import "utils.js" as Utils
 
 TestCase {
@@ -95,11 +96,11 @@ TestCase {
     }
 
     function test_setAndGet_data() {
-        var testSearchArea = QtLocation.circle(QtLocation.coordinate(10, 20), 5000);
+        var testSearchArea = QtPositioning.circle(QtPositioning.coordinate(10, 20), 5000);
 
         return [
             { tag: "plugin", property: "plugin", signal: "pluginChanged", value: testPlugin },
-            { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea, reset: QtLocation.shape() },
+            { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea, reset: QtPositioning.shape() },
             { tag: "offset", property: "offset", signal: "offsetChanged", value: 10, reset: 0 },
             { tag: "limit", property: "limit", signal: "limitChanged", value: 10, reset: -1 },
 
diff --git a/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml b/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml
index 156fae71..0222eecc 100644
--- a/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml
+++ b/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml
@@ -42,6 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 import "utils.js" as Utils
 
 TestCase {
@@ -69,10 +70,10 @@ TestCase {
     }
 
     function test_setAndGet_data() {
-        var testSearchArea = QtLocation.circle(QtLocation.coordinate(10, 20), 5000);
+        var testSearchArea = QtPositioning.circle(QtPositioning.coordinate(10, 20), 5000);
         return [
             { tag: "plugin", property: "plugin", signal: "pluginChanged", value: testPlugin },
-            { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea, reset: QtLocation.shape() },
+            { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea, reset: QtPositioning.shape() },
             { tag: "offset", property: "offset", signal: "offsetChanged", value: 10, reset: 0 },
             { tag: "limit", property: "limit", signal: "limitChanged", value: 10, reset: -1 },
 
diff --git a/tests/auto/declarative_core/tst_position.qml b/tests/auto/declarative_core/tst_position.qml
index 48a35796..65172d62 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 QtLocation 5.0
+import QtPositioning 5.0
 
 TestCase {
     id: testCase
diff --git a/tests/auto/declarative_core/tst_positionsource.qml b/tests/auto/declarative_core/tst_positionsource.qml
index 46540fcf..82c25c52 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 QtLocation 5.0
+import QtPositioning 5.0
 
 TestCase {
     id: testCase
diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml
index 7c07d93e..38be06b5 100644
--- a/tests/auto/declarative_ui/tst_map.qml
+++ b/tests/auto/declarative_ui/tst_map.qml
@@ -42,6 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 
 Item {
     width:100
@@ -62,12 +63,12 @@ Item {
                    ]
     }
 
-    property variant coordinate1: QtLocation.coordinate(10, 11)
-    property variant coordinate2: QtLocation.coordinate(12, 13)
-    property variant coordinate3: QtLocation.coordinate(50, 50, 0)
-    property variant coordinate4: QtLocation.coordinate(80, 80, 0)
-    property variant invalidCoordinate: QtLocation.coordinate()
-    property variant altitudelessCoordinate: QtLocation.coordinate(50, 50)
+    property variant coordinate1: QtPositioning.coordinate(10, 11)
+    property variant coordinate2: QtPositioning.coordinate(12, 13)
+    property variant coordinate3: QtPositioning.coordinate(50, 50, 0)
+    property variant coordinate4: QtPositioning.coordinate(80, 80, 0)
+    property variant invalidCoordinate: QtPositioning.coordinate()
+    property variant altitudelessCoordinate: QtPositioning.coordinate(50, 50)
 
     Map {id: map; plugin: testPlugin; center: coordinate1; width: 100; height: 100}
     Map {id: coordinateMap; plugin: nokiaPlugin; center: coordinate3; width: 1000; height: 1000; zoomLevel: 15}
diff --git a/tests/auto/declarative_ui/tst_map_geocoding.qml b/tests/auto/declarative_ui/tst_map_geocoding.qml
index ca7e93c0..a61c993b 100644
--- a/tests/auto/declarative_ui/tst_map_geocoding.qml
+++ b/tests/auto/declarative_ui/tst_map_geocoding.qml
@@ -42,22 +42,23 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 
 Item {
     Plugin { id: nokiaPlugin; name: "qmlgeo.test.plugin"}
     Plugin { id: invalidPlugin; name: "invalid"}
 
-    property variant coordinate1: QtLocation.coordinate(51, 41)
-    property variant coordinate2: QtLocation.coordinate(52, 42)
-    property variant coordinate3: QtLocation.coordinate(53, 43)
-    property variant emptyCoordinate: QtLocation.coordinate()
+    property variant coordinate1: QtPositioning.coordinate(51, 41)
+    property variant coordinate2: QtPositioning.coordinate(52, 42)
+    property variant coordinate3: QtPositioning.coordinate(53, 43)
+    property variant emptyCoordinate: QtPositioning.coordinate()
 
-    property variant boundingBox1: QtLocation.rectangle(coordinate1, coordinate2)
-    property variant boundingBox2: QtLocation.rectangle(coordinate1, coordinate3)
-    property variant boundingCircle1: QtLocation.circle(coordinate1, 100)
-    property variant boundingCircle2: QtLocation.circle(coordinate2, 100)
+    property variant boundingBox1: QtPositioning.rectangle(coordinate1, coordinate2)
+    property variant boundingBox2: QtPositioning.rectangle(coordinate1, coordinate3)
+    property variant boundingCircle1: QtPositioning.circle(coordinate1, 100)
+    property variant boundingCircle2: QtPositioning.circle(coordinate2, 100)
 
-    property variant emptyBox: QtLocation.rectangle()
+    property variant emptyBox: QtPositioning.rectangle()
 
     GeocodeModel {id: emptyModel}
 
@@ -124,7 +125,7 @@ Item {
             compare(boundsSpy.count, 2)
             compare(emptyModel.bounds.topLeft.latitude, boundingBox2.topLeft.latitude)
             compare(emptyModel.bounds.bottomRight.longitude, boundingBox2.bottomRight.longitude)
-            emptyModel.bounds = QtLocation.rectangle();
+            emptyModel.bounds = QtPositioning.rectangle();
             compare(boundsSpy.count, 3)
 
 
@@ -139,7 +140,7 @@ Item {
             emptyModel.bounds = boundingCircle2
             compare(boundsSpy.count, 2)
             compare(emptyModel.bounds.center.latitude, coordinate2.latitude)
-            var dynamicCircle = QtLocation.circle(QtLocation.coordinate(8, 9));
+            var dynamicCircle = QtPositioning.circle(QtPositioning.coordinate(8, 9));
             emptyModel.bounds = dynamicCircle
             compare(boundsSpy.count, 3)
             compare(emptyModel.bounds.center.latitude, dynamicCircle.center.latitude)
@@ -194,12 +195,12 @@ Item {
     Address {id: address1; street: "wellknown street"; city: "expected city"; county: "2"}
     Address {id: errorAddress1; street: "error"; county: "2"} // street is the error reason
 
-    property variant rcoordinate1: QtLocation.coordinate(51, 2)
-    property variant errorCoordinate1: QtLocation.coordinate(73, 2)  // (latiude mod 70) is the error code
-    property variant slackCoordinate1: QtLocation.coordinate(60, 3)
+    property variant rcoordinate1: QtPositioning.coordinate(51, 2)
+    property variant errorCoordinate1: QtPositioning.coordinate(73, 2)  // (latiude mod 70) is the error code
+    property variant slackCoordinate1: QtPositioning.coordinate(60, 3)
     Address {id: slackAddress1; street: "Slacker st"; city: "Lazy town"; county: "4"}
 
-    property variant automaticCoordinate1: QtLocation.coordinate(60, 3)
+    property variant automaticCoordinate1: QtPositioning.coordinate(60, 3)
     Address {id: automaticAddress1; street: "Auto st"; city: "Detroit"; county: "4"}
 
     Plugin {
diff --git a/tests/auto/declarative_ui/tst_map_item.qml b/tests/auto/declarative_ui/tst_map_item.qml
index 99aae6ed..16ee16b4 100644
--- a/tests/auto/declarative_ui/tst_map_item.qml
+++ b/tests/auto/declarative_ui/tst_map_item.qml
@@ -75,9 +75,9 @@ Item {
     height: 240
     Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true }
 
-    property variant mapDefaultCenter: QtLocation.coordinate(20, 20)
-    property variant someCoordinate1: QtLocation.coordinate(15, 15)
-    property variant someCoordinate2: QtLocation.coordinate(16, 16)
+    property variant mapDefaultCenter: QtPositioning.coordinate(20, 20)
+    property variant someCoordinate1: QtPositioning.coordinate(15, 15)
+    property variant someCoordinate2: QtPositioning.coordinate(16, 16)
 
     Route { id: someRoute;
         path: [
diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml
index 50be77fe..0182bb8d 100644
--- a/tests/auto/declarative_ui/tst_map_item_details.qml
+++ b/tests/auto/declarative_ui/tst_map_item_details.qml
@@ -51,11 +51,11 @@ Item {
     height: 240
     Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true }
 
-    property variant mapDefaultCenter: QtLocation.coordinate(20, 20)
+    property variant mapDefaultCenter: QtPositioning.coordinate(20, 20)
 
-    property variant datelineCoordinate: QtLocation.coordinate(20, 180)
-    property variant datelineCoordinateLeft: QtLocation.coordinate(20, 170)
-    property variant datelineCoordinateRight: QtLocation.coordinate(20, -170)
+    property variant datelineCoordinate: QtPositioning.coordinate(20, 180)
+    property variant datelineCoordinateLeft: QtPositioning.coordinate(20, 170)
+    property variant datelineCoordinateRight: QtPositioning.coordinate(20, -170)
 
     MapPolygon {
         id: extMapPolygon
@@ -75,7 +75,7 @@ Item {
         SignalSpy {id: extMapPolygonBorderColorChanged; target: parent.border; signalName: "colorChanged"}
     }
 
-    property variant polyCoordinate: QtLocation.coordinate(15, 6)
+    property variant polyCoordinate: QtPositioning.coordinate(15, 6)
 
     MapPolygon {
         id: extMapPolygon0
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 334c0853..d0af06be 100644
--- a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
+++ b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
@@ -42,6 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 import QtLocation.test 5.0
 
     /*
@@ -75,11 +76,11 @@ Item {
     height: 240
     Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true }
 
-    property variant mapDefaultCenter: QtLocation.coordinate(20, 20)
-    property variant preMapRectangleDefaultTopLeft: QtLocation.coordinate(20, 20)
-    property variant preMapRectangleDefaultBottomRight: QtLocation.coordinate(10, 30)
-    property variant preMapCircleDefaultCenter: QtLocation.coordinate(10, 30)
-    property variant preMapQuickItemDefaultCoordinate: QtLocation.coordinate(35, 3)
+    property variant mapDefaultCenter: QtPositioning.coordinate(20, 20)
+    property variant preMapRectangleDefaultTopLeft: QtPositioning.coordinate(20, 20)
+    property variant preMapRectangleDefaultBottomRight: QtPositioning.coordinate(10, 30)
+    property variant preMapCircleDefaultCenter: QtPositioning.coordinate(10, 30)
+    property variant preMapQuickItemDefaultCoordinate: QtPositioning.coordinate(35, 3)
 
     property variant preMapPolygonDefaultPath: [
         { latitude: 25, longitude: 5 },
@@ -99,19 +100,19 @@ Item {
         { latitude: 15, longitude: 15 }
     ]
 
-    property variant mapCircleTopLeft: QtLocation.coordinate(0, 0)
-    property variant mapCircleBottomRight: QtLocation.coordinate(0, 0)
-    property variant mapQuickItemTopLeft: QtLocation.coordinate(0, 0)
-    property variant mapQuickItemBottomRight: QtLocation.coordinate(0, 0)
-    property variant mapPolygonTopLeft: QtLocation.coordinate(0, 0)
-    property variant mapPolygonBottomRight: QtLocation.coordinate(0, 0)
-    property variant mapPolylineTopLeft: QtLocation.coordinate(0, 0)
-    property variant mapPolylineBottomRight: QtLocation.coordinate(0, 0)
-    property variant mapRouteTopLeft: QtLocation.coordinate(0, 0)
-    property variant mapRouteBottomRight: QtLocation.coordinate(0, 0)
+    property variant mapCircleTopLeft: QtPositioning.coordinate(0, 0)
+    property variant mapCircleBottomRight: QtPositioning.coordinate(0, 0)
+    property variant mapQuickItemTopLeft: QtPositioning.coordinate(0, 0)
+    property variant mapQuickItemBottomRight: QtPositioning.coordinate(0, 0)
+    property variant mapPolygonTopLeft: QtPositioning.coordinate(0, 0)
+    property variant mapPolygonBottomRight: QtPositioning.coordinate(0, 0)
+    property variant mapPolylineTopLeft: QtPositioning.coordinate(0, 0)
+    property variant mapPolylineBottomRight: QtPositioning.coordinate(0, 0)
+    property variant mapRouteTopLeft: QtPositioning.coordinate(0, 0)
+    property variant mapRouteBottomRight: QtPositioning.coordinate(0, 0)
 
-    property variant boundingBox: QtLocation.rectangle(QtLocation.coordinate(0, 0),
-                                                       QtLocation.coordinate(0, 0))
+    property variant boundingBox: QtPositioning.rectangle(QtPositioning.coordinate(0, 0),
+                                                       QtPositioning.coordinate(0, 0))
 
     Map {
         id: map;
@@ -468,7 +469,7 @@ Item {
             point.y = maxY
             var itemBottomRight = map.toCoordinate(point)
 
-            return QtLocation.rectangle(itemTopLeft, itemBottomRight);
+            return QtPositioning.rectangle(itemTopLeft, itemBottomRight);
         }
 
         function verify_visibility_all_items(){
diff --git a/tests/auto/declarative_ui/tst_map_itemview.qml b/tests/auto/declarative_ui/tst_map_itemview.qml
index d8cc5ff5..27b3c660 100644
--- a/tests/auto/declarative_ui/tst_map_itemview.qml
+++ b/tests/auto/declarative_ui/tst_map_itemview.qml
@@ -42,6 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 import QtLocation.test 5.0
 
 Item {
@@ -51,7 +52,7 @@ Item {
     // General-purpose elements for the test:
     Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true }
 
-    property variant mapDefaultCenter: QtLocation.coordinate(10, 30)
+    property variant mapDefaultCenter: QtPositioning.coordinate(10, 30)
 
     Map {
         id: map
@@ -216,8 +217,8 @@ Item {
         anchors.fill: parent;
         zoomLevel: 2
 
-        property variant firstItemCoord: QtLocation.coordinate(11, 31)
-        property variant secondItemCoord: QtLocation.coordinate(12, 32)
+        property variant firstItemCoord: QtPositioning.coordinate(11, 31)
+        property variant secondItemCoord: QtPositioning.coordinate(12, 32)
 
         MapItemView {
             id: listModelItemView
diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml
index d01b310b..87f5638b 100644
--- a/tests/auto/declarative_ui/tst_map_mouse.qml
+++ b/tests/auto/declarative_ui/tst_map_mouse.qml
@@ -42,6 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 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 fa21db6c..8ef97b43 100644
--- a/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml
+++ b/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml
@@ -42,6 +42,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtLocation 5.0
+import QtPositioning 5.0
 import QtLocation.test 5.0
 
 Item {
@@ -51,7 +52,7 @@ Item {
     height: 100
     Plugin { id: testPlugin; name: "qmlgeo.test.plugin"; allowExperimental: true }
 
-    property variant coordinate1: QtLocation.coordinate(10, 11)
+    property variant coordinate1: QtPositioning.coordinate(10, 11)
 
     Map {
         id: map
diff --git a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h
index 08c77360..19d61629 100644
--- a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h
@@ -45,10 +45,10 @@
 #include <qgeoserviceprovider.h>
 #include <qgeocodingmanagerengine.h>
 #include <QLocale>
-#include <qgeoaddress.h>
-#include <qgeolocation.h>
+#include <QtPositioning/qgeoaddress.h>
+#include <QtPositioning/qgeolocation.h>
 #include <qgeocodereply.h>
-#include <QtLocation/QGeoShape>
+#include <QtPositioning/QGeoShape>
 
 #include <QTimer>
 #include <QDebug>
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index 6dfcb3a2..6096ffe1 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -48,8 +48,8 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
 #include <QtCore/QUuid>
-#include <QtLocation/QGeoCoordinate>
-#include <QtLocation/QGeoLocation>
+#include <QtPositioning/QGeoCoordinate>
+#include <QtPositioning/QGeoLocation>
 #include <QtLocation/QPlaceContentReply>
 #include <QtLocation/QPlaceManager>
 #include <QtLocation/QPlaceManagerEngine>
diff --git a/tests/auto/nokia_services/places_semiauto/tst_places.cpp b/tests/auto/nokia_services/places_semiauto/tst_places.cpp
index 65d64ae2..e6e7859f 100644
--- a/tests/auto/nokia_services/places_semiauto/tst_places.cpp
+++ b/tests/auto/nokia_services/places_semiauto/tst_places.cpp
@@ -44,7 +44,7 @@
 #include <QtTest/QtTest>
 
 #include <QtCore/QProcessEnvironment>
-#include <QtLocation/QGeoCircle>
+#include <QtPositioning/QGeoCircle>
 #include <QtLocation/QGeoServiceProvider>
 #include <QtLocation/QPlaceEditorial>
 #include <QtLocation/QPlaceImage>
diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp
index fdbb8571..b64202a6 100644
--- a/tests/auto/nokia_services/routing/tst_routing.cpp
+++ b/tests/auto/nokia_services/routing/tst_routing.cpp
@@ -48,7 +48,7 @@
 #include <QtLocation/QGeoRouteReply>
 #include <QtLocation/QGeoServiceProvider>
 #include <QtLocation/QGeoRoutingManager>
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/QGeoRectangle>
 #include <QtLocation/QGeoManeuver>
 #include <QtLocation/QGeoRouteSegment>
 
diff --git a/tests/auto/positionplugin/positionplugin.pro b/tests/auto/positionplugin/positionplugin.pro
index 72918415..768e6864 100644
--- a/tests/auto/positionplugin/positionplugin.pro
+++ b/tests/auto/positionplugin/positionplugin.pro
@@ -1,5 +1,5 @@
 TARGET = qtposition_testplugin
-QT += location
+QT += positioning
 
 PLUGIN_TYPE = position
 load(qt_plugin)
diff --git a/tests/auto/positionplugintest/positionplugintest.pro b/tests/auto/positionplugintest/positionplugintest.pro
index 4dbf36d9..da68f966 100644
--- a/tests/auto/positionplugintest/positionplugintest.pro
+++ b/tests/auto/positionplugintest/positionplugintest.pro
@@ -4,5 +4,5 @@ TARGET=tst_positionplugin
 
 SOURCES += tst_positionplugin.cpp
 
-QT += location testlib
+QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeoaddress/qgeoaddress.pro b/tests/auto/qgeoaddress/qgeoaddress.pro
index 692fe86c..57274cdf 100644
--- a/tests/auto/qgeoaddress/qgeoaddress.pro
+++ b/tests/auto/qgeoaddress/qgeoaddress.pro
@@ -4,5 +4,5 @@ TARGET = tst_qgeoaddress
 
 SOURCES += tst_qgeoaddress.cpp
 
-QT += location testlib
+QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeocircle/qgeocircle.pro b/tests/auto/qgeocircle/qgeocircle.pro
index 5d132475..91437b76 100644
--- a/tests/auto/qgeocircle/qgeocircle.pro
+++ b/tests/auto/qgeocircle/qgeocircle.pro
@@ -5,5 +5,5 @@ TARGET = tst_qgeocircle
 SOURCES += \
     tst_qgeocircle.cpp
 
-QT += location testlib
+QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeocircle/tst_qgeocircle.cpp b/tests/auto/qgeocircle/tst_qgeocircle.cpp
index 908ccaff..dde256bd 100644
--- a/tests/auto/qgeocircle/tst_qgeocircle.cpp
+++ b/tests/auto/qgeocircle/tst_qgeocircle.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtLocation/QGeoCoordinate>
-#include <QtLocation/QGeoCircle>
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/QGeoCoordinate>
+#include <QtPositioning/QGeoCircle>
+#include <QtPositioning/QGeoRectangle>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qgeocodereply/tst_qgeocodereply.h b/tests/auto/qgeocodereply/tst_qgeocodereply.h
index 23409ecc..62286e91 100644
--- a/tests/auto/qgeocodereply/tst_qgeocodereply.h
+++ b/tests/auto/qgeocodereply/tst_qgeocodereply.h
@@ -54,7 +54,7 @@
 #include <qgeolocation.h>
 #include <qgeoaddress.h>
 #include <qgeocoordinate.h>
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/QGeoRectangle>
 
 QT_USE_NAMESPACE
 class SubGeocodeReply : public QGeocodeReply
diff --git a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h
index ea2d1e02..065d5134 100644
--- a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h
+++ b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h
@@ -51,7 +51,7 @@
 #include <qgeoserviceprovider.h>
 #include <qgeocodingmanager.h>
 #include <qgeocodereply.h>
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/QGeoRectangle>
 #include <qgeoaddress.h>
 #include <qgeocoordinate.h>
 
diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
index e03702cf..49ce3215 100644
--- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
+++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
@@ -48,7 +48,7 @@
 #include <qgeoaddress.h>
 #include <qgeolocation.h>
 #include <qgeocodereply.h>
-#include <QtLocation/QGeoCoordinate>
+#include <QtPositioning/QGeoCoordinate>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qgeocoordinate/qgeocoordinate.pro b/tests/auto/qgeocoordinate/qgeocoordinate.pro
index 0a0ee195..7f29a28a 100644
--- a/tests/auto/qgeocoordinate/qgeocoordinate.pro
+++ b/tests/auto/qgeocoordinate/qgeocoordinate.pro
@@ -5,5 +5,5 @@ HEADERS += ../utils/qlocationtestutils_p.h
 SOURCES += tst_qgeocoordinate.cpp \
            ../utils/qlocationtestutils.cpp
 
-QT += location testlib
+QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeolocation/qgeolocation.pro b/tests/auto/qgeolocation/qgeolocation.pro
index 7f3f650e..cd951c7b 100644
--- a/tests/auto/qgeolocation/qgeolocation.pro
+++ b/tests/auto/qgeolocation/qgeolocation.pro
@@ -6,5 +6,5 @@ HEADERS += ../utils/qlocationtestutils_p.h \
 SOURCES += tst_qgeolocation.cpp \
            ../utils/qlocationtestutils.cpp
 
-QT += location testlib
+QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeolocation/tst_qgeolocation.h b/tests/auto/qgeolocation/tst_qgeolocation.h
index 9ba81a44..0d34f982 100644
--- a/tests/auto/qgeolocation/tst_qgeolocation.h
+++ b/tests/auto/qgeolocation/tst_qgeolocation.h
@@ -48,10 +48,10 @@
 #include <QMetaType>
 
 #include "../utils/qlocationtestutils_p.h"
-#include <qgeoaddress.h>
-#include <qgeocoordinate.h>
-#include <qgeolocation.h>
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/qgeoaddress.h>
+#include <QtPositioning/qgeocoordinate.h>
+#include <QtPositioning/qgeolocation.h>
+#include <QtPositioning/QGeoRectangle>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qgeorectangle/qgeorectangle.pro b/tests/auto/qgeorectangle/qgeorectangle.pro
index bb3d5362..6837d0a4 100644
--- a/tests/auto/qgeorectangle/qgeorectangle.pro
+++ b/tests/auto/qgeorectangle/qgeorectangle.pro
@@ -5,5 +5,5 @@ TARGET = tst_qgeorectangle
 SOURCES += \
     tst_qgeorectangle.cpp
 
-QT += location testlib
+QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeorectangle/tst_qgeorectangle.cpp b/tests/auto/qgeorectangle/tst_qgeorectangle.cpp
index f600ff72..d0c9672d 100644
--- a/tests/auto/qgeorectangle/tst_qgeorectangle.cpp
+++ b/tests/auto/qgeorectangle/tst_qgeorectangle.cpp
@@ -42,9 +42,9 @@
 //TESTED_COMPONENT=src/location
 
 #include <QtTest/QtTest>
-#include <QtLocation/QGeoCoordinate>
-#include <QtLocation/QGeoCircle>
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/QGeoCoordinate>
+#include <QtPositioning/QGeoCircle>
+#include <QtPositioning/QGeoRectangle>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qgeoroute/tst_qgeoroute.h b/tests/auto/qgeoroute/tst_qgeoroute.h
index 5b05e2f4..25ea06e6 100644
--- a/tests/auto/qgeoroute/tst_qgeoroute.h
+++ b/tests/auto/qgeoroute/tst_qgeoroute.h
@@ -47,7 +47,7 @@
 #include <QMetaType>
 
 #include <qgeoroute.h>
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/QGeoRectangle>
 #include <qgeocoordinate.h>
 #include <qgeorouterequest.h>
 #include <qgeoroutesegment.h>
diff --git a/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp b/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp
index ffcde9d8..7cfd3ff0 100644
--- a/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp
+++ b/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp
@@ -41,7 +41,7 @@
 
 #include "tst_qgeorouterequest.h"
 
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/QGeoRectangle>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qgeorouterequest/tst_qgeorouterequest.h b/tests/auto/qgeorouterequest/tst_qgeorouterequest.h
index 5706a885..2c7bd2e2 100644
--- a/tests/auto/qgeorouterequest/tst_qgeorouterequest.h
+++ b/tests/auto/qgeorouterequest/tst_qgeorouterequest.h
@@ -47,7 +47,7 @@
 #include <QMetaType>
 
 #include <qgeocoordinate.h>
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/QGeoRectangle>
 #include <qgeorouterequest.h>
 
 
diff --git a/tests/auto/qgeoshape/qgeoshape.pro b/tests/auto/qgeoshape/qgeoshape.pro
index 9c3b1f64..03b01b65 100644
--- a/tests/auto/qgeoshape/qgeoshape.pro
+++ b/tests/auto/qgeoshape/qgeoshape.pro
@@ -1,6 +1,6 @@
 load(testcase)
 TARGET = tst_qgeoshape
-QT += testlib location
+QT += testlib positioning
 SOURCES = \
     tst_qgeoshape.cpp
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeoshape/tst_qgeoshape.cpp b/tests/auto/qgeoshape/tst_qgeoshape.cpp
index 24d51003..594d4fd5 100644
--- a/tests/auto/qgeoshape/tst_qgeoshape.cpp
+++ b/tests/auto/qgeoshape/tst_qgeoshape.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtLocation/QGeoShape>
+#include <QtPositioning/QGeoShape>
 
 class tst_qgeoshape : public QObject
 {
diff --git a/tests/auto/qmlinterface/tst_qmlinterface.cpp b/tests/auto/qmlinterface/tst_qmlinterface.cpp
index ba80833d..1919a817 100644
--- a/tests/auto/qmlinterface/tst_qmlinterface.cpp
+++ b/tests/auto/qmlinterface/tst_qmlinterface.cpp
@@ -43,11 +43,11 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlComponent>
 #include <QtQml/QQmlListReference>
-#include <QtLocation/QGeoCoordinate>
-#include <QtLocation/QGeoAddress>
-#include <QtLocation/QGeoRectangle>
-#include <QtLocation/QGeoCircle>
-#include <QtLocation/QGeoLocation>
+#include <QtPositioning/QGeoCoordinate>
+#include <QtPositioning/QGeoAddress>
+#include <QtPositioning/QGeoRectangle>
+#include <QtPositioning/QGeoCircle>
+#include <QtPositioning/QGeoLocation>
 #include <QtLocation/QPlaceCategory>
 #include <QtLocation/QPlace>
 #include <QtLocation/QPlaceIcon>
diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro
index 7fbf31e1..b8338f90 100644
--- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro
+++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG+=testcase
-QT += network location testlib
+QT += network positioning testlib
 TARGET = tst_dummynmeapositioninfosource
 
 INCLUDEPATH += ..
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro
index 73b12dff..83e6bf16 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG+=testcase
-QT += network location testlib
+QT += network positioning testlib
 TARGET = tst_qnmeapositioninfosource_realtime
 
 INCLUDEPATH += ..
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro
index 200cb8b4..ca1c258f 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 CONFIG+=testcase
 testcase.timeout = 400 # this test is slow
-QT += network location testlib
+QT += network positioning testlib
 TARGET = tst_qnmeapositioninfosource_realtime_generic
 
 INCLUDEPATH += ..
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro
index 2f03484a..655a5f10 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG+=testcase
-QT += network location testlib
+QT += network positioning testlib
 TARGET = tst_qnmeapositioninfosource_simulation
 
 INCLUDEPATH += ..
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro
index 7bc48a32..cf94e7f8 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 CONFIG+=testcase
 testcase.timeout = 400 # this test is slow
-QT += network location testlib
+QT += network positioning testlib
 TARGET = tst_qnmeapositioninfosource_simulation_generic
 
 INCLUDEPATH += ..
diff --git a/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp b/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp
index 94d28ad9..24a76bc7 100644
--- a/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp
+++ b/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp
@@ -44,7 +44,7 @@
 
 #include <QtLocation/QPlaceSearchReply>
 #include <QtLocation/QPlaceResult>
-#include <QtLocation/QGeoCircle>
+#include <QtPositioning/QGeoCircle>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp
index 5753ddd3..318e8353 100644
--- a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp
+++ b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp
@@ -42,8 +42,8 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 #include <QtLocation/QPlaceSearchRequest>
-#include <QtLocation/QGeoCircle>
-#include <QtLocation/QGeoRectangle>
+#include <QtPositioning/QGeoCircle>
+#include <QtPositioning/QGeoRectangle>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h
index 7a3b925e..a0a596b4 100644
--- a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h
+++ b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h
@@ -47,7 +47,7 @@
 #include <QTimer>
 #include <QDebug>
 #include <QList>
-#include <QtLocation/QGeoCoordinate>
+#include <QtPositioning/QGeoCoordinate>
 
 class DataObject: public QObject
 {