summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-10-11 16:43:21 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-14 13:18:16 +0200
commit997e06d80c095ac994391bfb5d69c5ec9a52a11f (patch)
tree19d8d15e4bdc23ba647562dbd64c92333c07ce37 /tests
parente200f05bc75d8f19df624bc3849d9c5bbf096873 (diff)
downloadqtlocation-997e06d80c095ac994391bfb5d69c5ec9a52a11f.tar.gz
Add proper version to QtPositioning and its QML API.
The QML API remains available under 5.0 though. Change-Id: I037b82e5b12825db610e8458d6c82122ecde4f44 Reviewed-by: Erik Mattsson <erik.mattsson@appello.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/applications/declarative_map/map3d.qml2
-rw-r--r--tests/applications/declarative_map/map3d_mousetest.qml2
-rw-r--r--tests/auto/declarative_core/tst_address.qml2
-rw-r--r--tests/auto/declarative_core/tst_coordinate.qml2
-rw-r--r--tests/auto/declarative_core/tst_geoshape.qml2
-rw-r--r--tests/auto/declarative_core/tst_map_routing.qml2
-rw-r--r--tests/auto/declarative_core/tst_place.qml4
-rw-r--r--tests/auto/declarative_core/tst_placesearchmodel.qml2
-rw-r--r--tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml2
-rw-r--r--tests/auto/declarative_core/tst_position.qml2
-rw-r--r--tests/auto/declarative_core/tst_positionsource.qml2
-rw-r--r--tests/auto/declarative_ui/tst_map.qml2
-rw-r--r--tests/auto/declarative_ui/tst_map_geocoding.qml2
-rw-r--r--tests/auto/declarative_ui/tst_map_item_fit_viewport.qml2
-rw-r--r--tests/auto/declarative_ui/tst_map_itemview.qml2
-rw-r--r--tests/auto/declarative_ui/tst_map_mouse.qml2
-rw-r--r--tests/auto/declarative_ui/tst_map_pinch_and_flick.qml2
17 files changed, 18 insertions, 18 deletions
diff --git a/tests/applications/declarative_map/map3d.qml b/tests/applications/declarative_map/map3d.qml
index c9fc4e83..36ef927c 100644
--- a/tests/applications/declarative_map/map3d.qml
+++ b/tests/applications/declarative_map/map3d.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtPositioning 5.0
+import QtPositioning 5.2
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 bd317216..d07031b0 100644
--- a/tests/applications/declarative_map/map3d_mousetest.qml
+++ b/tests/applications/declarative_map/map3d_mousetest.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtPositioning 5.0
+import QtPositioning 5.2
import QtLocation 5.0
import QtLocation.test 5.0
import "common" as Common
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_geoshape.qml b/tests/auto/declarative_core/tst_geoshape.qml
index df03125f..72dd788b 100644
--- a/tests/auto/declarative_core/tst_geoshape.qml
+++ b/tests/auto/declarative_core/tst_geoshape.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_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..c2b6b93e 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
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 d0af06be..ae839123 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 {
View Lorry Controller Status