1 files changed, 9 insertions, 8 deletions
diff --git a/tests/auto/declarative_ui/tst_map_geocoding.qml b/tests/auto/declarative_ui/tst_map_geocoding.qml
index 2d64fcd6..072b27ee 100644
--- a/tests/auto/declarative_ui/tst_map_geocoding.qml
+++ b/tests/auto/declarative_ui/tst_map_geocoding.qml
@@ -49,14 +49,16 @@ Item {
 
     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()
 
-    GeoRectangle { id: boundingBox1; topLeft: coordinate2; bottomLeft: coordinate1; width: 1000 }
-    GeoRectangle { id: boundingBox2; topLeft: coordinate2; bottomLeft: coordinate1; width: 1000 }
-    GeoCircle { id: boundingCircle1; center: coordinate1; radius: 100 }
-    GeoCircle { id: boundingCircle2; center: coordinate2; radius: 100 }
+    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 emptyBox: QtLocation.rectangle()
 
-    GeoRectangle {id: emptyBox}
     GeocodeModel {id: emptyModel}
 
     Address {id: emptyAddress}
@@ -122,8 +124,7 @@ Item {
             compare(boundsSpy.count, 2)
             compare(emptyModel.bounds.topLeft.latitude, boundingBox2.topLeft.latitude)
             compare(emptyModel.bounds.bottomRight.longitude, boundingBox2.bottomRight.longitude)
-            var dynamicBox = Qt.createQmlObject("import QtQuick 2.0; import QtLocation 5.0; GeoRectangle { id: dynBox }", testCase1)
-            emptyModel.bounds = dynamicBox
+            emptyModel.bounds = QtLocation.rectangle();
             compare(boundsSpy.count, 3)
 
 
@@ -138,7 +139,7 @@ Item {
             emptyModel.bounds = boundingCircle2
             compare(boundsSpy.count, 2)
             compare(emptyModel.bounds.center.latitude, coordinate2.latitude)
-            var dynamicCircle = Qt.createQmlObject("import QtQuick 2.0; import QtLocation 5.0; GeoCircle { id: dynCircle; center { latitude: 8; longitude: 9 } }", testCase1)
+            var dynamicCircle = QtLocation.circle(QtLocation.coordinate(8, 9));
             emptyModel.bounds = dynamicCircle
             compare(boundsSpy.count, 3)
             compare(emptyModel.bounds.center.latitude, dynamicCircle.center.latitude)