diff options
Diffstat (limited to 'tests')
38 files changed, 67 insertions, 67 deletions
diff --git a/tests/applications/declarative_map/map3d.qml b/tests/applications/declarative_map/map3d.qml index 36ef927c..652d19af 100644 --- a/tests/applications/declarative_map/map3d.qml +++ b/tests/applications/declarative_map/map3d.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtPositioning 5.2 -import QtLocation 5.0 +import QtLocation 5.3 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 d07031b0..e875e07d 100644 --- a/tests/applications/declarative_map/map3d_mousetest.qml +++ b/tests/applications/declarative_map/map3d_mousetest.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtPositioning 5.2 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.test 5.0 import "common" as Common diff --git a/tests/auto/declarative_core/tst_category.qml b/tests/auto/declarative_core/tst_category.qml index 0f8addb8..9f8b7adc 100644 --- a/tests/auto/declarative_core/tst_category.qml +++ b/tests/auto/declarative_core/tst_category.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { diff --git a/tests/auto/declarative_core/tst_categorymodel.qml b/tests/auto/declarative_core/tst_categorymodel.qml index 0e867bdf..6190963e 100644 --- a/tests/auto/declarative_core/tst_categorymodel.qml +++ b/tests/auto/declarative_core/tst_categorymodel.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { @@ -87,7 +87,7 @@ TestCase { function test_hierarchicalModel() { var modelSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); - var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.0;' + var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3;' + 'VisualDataModel { model: CategoryModel {} delegate: Item {} }', testCase, "VisualDataModel"); @@ -160,7 +160,7 @@ TestCase { function test_flatModel() { var modelSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); - var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.0;' + var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3;' + 'VisualDataModel { model: CategoryModel {} delegate: Item {} }', testCase, "VisualDataModel"); @@ -218,7 +218,7 @@ TestCase { } function test_error() { - var testModel = Qt.createQmlObject('import QtLocation 5.0; CategoryModel {}', testCase, "CategoryModel"); + var testModel = Qt.createQmlObject('import QtLocation 5.3; CategoryModel {}', testCase, "CategoryModel"); var statusChangedSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); statusChangedSpy.target = testModel; diff --git a/tests/auto/declarative_core/tst_contactdetail.qml b/tests/auto/declarative_core/tst_contactdetail.qml index 23641497..5116d78d 100644 --- a/tests/auto/declarative_core/tst_contactdetail.qml +++ b/tests/auto/declarative_core/tst_contactdetail.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { diff --git a/tests/auto/declarative_core/tst_editorialmodel.qml b/tests/auto/declarative_core/tst_editorialmodel.qml index ae01b4fd..3135a05b 100644 --- a/tests/auto/declarative_core/tst_editorialmodel.qml +++ b/tests/auto/declarative_core/tst_editorialmodel.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { @@ -193,7 +193,7 @@ TestCase { } function createModel() { - return Qt.createQmlObject('import QtLocation 5.0; EditorialModel {}', + return Qt.createQmlObject('import QtLocation 5.3; EditorialModel {}', testCase, "editorialModel"); } } diff --git a/tests/auto/declarative_core/tst_imagemodel.qml b/tests/auto/declarative_core/tst_imagemodel.qml index 31f1e448..eb2a1ce2 100644 --- a/tests/auto/declarative_core/tst_imagemodel.qml +++ b/tests/auto/declarative_core/tst_imagemodel.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { @@ -193,7 +193,7 @@ TestCase { } function createModel() { - return Qt.createQmlObject('import QtLocation 5.0; ImageModel {}', + return Qt.createQmlObject('import QtLocation 5.3; ImageModel {}', testCase, "imageModel"); } } diff --git a/tests/auto/declarative_core/tst_map_routing.qml b/tests/auto/declarative_core/tst_map_routing.qml index bc5962b9..605e1e15 100644 --- a/tests/auto/declarative_core/tst_map_routing.qml +++ b/tests/auto/declarative_core/tst_map_routing.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 Item { diff --git a/tests/auto/declarative_core/tst_place.qml b/tests/auto/declarative_core/tst_place.qml index 598872a7..cb25f76d 100644 --- a/tests/auto/declarative_core/tst_place.qml +++ b/tests/auto/declarative_core/tst_place.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 import "utils.js" as Utils @@ -328,8 +328,8 @@ TestCase { function test_categories() { var categories = new Array(2); - categories[0] = Qt.createQmlObject('import QtLocation 5.0; Category { categoryId: "cat-id-1"; name: "Category 1" }', testCase, "Category1"); - categories[1] = Qt.createQmlObject('import QtLocation 5.0; Category { categoryId: "cat-id-2"; name: "Category 2" }', testCase, "Category2"); + categories[0] = Qt.createQmlObject('import QtLocation 5.3; Category { categoryId: "cat-id-1"; name: "Category 1" }', testCase, "Category1"); + categories[1] = Qt.createQmlObject('import QtLocation 5.3; Category { categoryId: "cat-id-2"; name: "Category 2" }', testCase, "Category2"); var signalSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); signalSpy.target = testPlace; @@ -366,7 +366,7 @@ TestCase { } function test_supplier() { - var supplier = Qt.createQmlObject('import QtLocation 5.0; Supplier { supplierId: "sup-id-1"; name: "Category 1" }', testCase, "Supplier1"); + var supplier = Qt.createQmlObject('import QtLocation 5.3; Supplier { supplierId: "sup-id-1"; name: "Category 1" }', testCase, "Supplier1"); var signalSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); signalSpy.target = testPlace; @@ -422,7 +422,7 @@ TestCase { } function test_ratings() { - var ratings = Qt.createQmlObject('import QtLocation 5.0; Ratings { average: 3; count: 100 }', testCase, "Rating1"); + var ratings = Qt.createQmlObject('import QtLocation 5.3; Ratings { average: 3; count: 100 }', testCase, "Rating1"); var signalSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); signalSpy.target = testPlace; @@ -449,7 +449,7 @@ TestCase { function test_extendedAttributes() { verify(testPlace.extendedAttributes); - testPlace.extendedAttributes["foo"] = Qt.createQmlObject('import QtLocation 5.0; PlaceAttribute { text: "Foo"; label: "Foo label" }', testCase, 'PlaceAttribute'); + testPlace.extendedAttributes["foo"] = Qt.createQmlObject('import QtLocation 5.3; PlaceAttribute { text: "Foo"; label: "Foo label" }', testCase, 'PlaceAttribute'); verify(testPlace.extendedAttributes.foo); compare(testPlace.extendedAttributes.foo.text, "Foo"); @@ -462,7 +462,7 @@ TestCase { function test_contactDetailsProperty() { verify(testPlace.contactDetails); - testPlace.contactDetails["phone"] = Qt.createQmlObject('import QtLocation 5.0; ContactDetail { label: "Test Label"; value: "Detail Value" }', testCase, 'ContactDetail'); + testPlace.contactDetails["phone"] = Qt.createQmlObject('import QtLocation 5.3; ContactDetail { label: "Test Label"; value: "Detail Value" }', testCase, 'ContactDetail'); verify(testPlace.contactDetails.phone); compare(testPlace.contactDetails.phone[0].label, "Test Label"); @@ -502,7 +502,7 @@ TestCase { // Read a place - var readPlace = Qt.createQmlObject('import QtLocation 5.0; Place { }', testCase, "test_saveload"); + var readPlace = Qt.createQmlObject('import QtLocation 5.3; Place { }', testCase, "test_saveload"); signalSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); signalSpy.target = readPlace; @@ -539,7 +539,7 @@ TestCase { // Remove a place - var removePlace = Qt.createQmlObject('import QtLocation 5.0; Place { }', testCase, "test_saveload"); + var removePlace = Qt.createQmlObject('import QtLocation 5.3; Place { }', testCase, "test_saveload"); signalSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); signalSpy.target = removePlace; @@ -575,7 +575,7 @@ TestCase { } function test_copy() { - var place = Qt.createQmlObject('import QtLocation 5.0; Place { }', this); + var place = Qt.createQmlObject('import QtLocation 5.3; Place { }', this); place.plugin = testPlugin; place.copyFrom(dummyPlace); compare(place.placeId, ""); @@ -584,13 +584,13 @@ TestCase { } function test_contactDetails(data) { - var place = Qt.createQmlObject('import QtLocation 5.0; Place {}', this); + var place = Qt.createQmlObject('import QtLocation 5.3; Place {}', this); var signalSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); signalSpy.target = place; signalSpy.signalName = data.signalName; - var detail1 = Qt.createQmlObject('import QtLocation 5.0; ContactDetail {}', this); + var detail1 = Qt.createQmlObject('import QtLocation 5.3; ContactDetail {}', this); detail1.label = "Detail1"; detail1.value = "555-detail1"; @@ -607,7 +607,7 @@ TestCase { listView.model = place.contactDetails[data.contactType]; compare(listView.count, 1); - var detail2 = Qt.createQmlObject('import QtLocation 5.0; ContactDetail {}', this); + var detail2 = Qt.createQmlObject('import QtLocation 5.3; ContactDetail {}', this); detail2.label = "Detail2"; detail2.value = "555-detail2"; diff --git a/tests/auto/declarative_core/tst_placeattribute.qml b/tests/auto/declarative_core/tst_placeattribute.qml index daa237b4..5fd569d0 100644 --- a/tests/auto/declarative_core/tst_placeattribute.qml +++ b/tests/auto/declarative_core/tst_placeattribute.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { diff --git a/tests/auto/declarative_core/tst_placeicon.qml b/tests/auto/declarative_core/tst_placeicon.qml index d1f45049..6c6b8e74 100644 --- a/tests/auto/declarative_core/tst_placeicon.qml +++ b/tests/auto/declarative_core/tst_placeicon.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { diff --git a/tests/auto/declarative_core/tst_placesearchmodel.qml b/tests/auto/declarative_core/tst_placesearchmodel.qml index 2020a4f8..68c21bb3 100644 --- a/tests/auto/declarative_core/tst_placesearchmodel.qml +++ b/tests/auto/declarative_core/tst_placesearchmodel.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 import "utils.js" as Utils @@ -114,13 +114,13 @@ TestCase { } function test_setAndGet(data) { - var testModel = Qt.createQmlObject('import QtLocation 5.0; PlaceSearchModel {}', testCase, "PlaceSearchModel"); + var testModel = Qt.createQmlObject('import QtLocation 5.3; PlaceSearchModel {}', testCase, "PlaceSearchModel"); Utils.testObjectProperties(testCase, testModel, data); delete testModel; } function test_search_data() { - var park = Qt.createQmlObject('import QtLocation 5.0; Category {name: "Park"; categoryId: "c2e1252c-b997-44fc-8165-e53dd00f66a7"}', testCase, "Category"); + var park = Qt.createQmlObject('import QtLocation 5.3; Category {name: "Park"; categoryId: "c2e1252c-b997-44fc-8165-e53dd00f66a7"}', testCase, "Category"); return [ { tag: "searchTerm, multiple results", @@ -170,7 +170,7 @@ TestCase { } function test_search(data) { - var testModel = Qt.createQmlObject('import QtLocation 5.0; PlaceSearchModel {}', testCase, "PlaceSearchModel"); + var testModel = Qt.createQmlObject('import QtLocation 5.3; PlaceSearchModel {}', testCase, "PlaceSearchModel"); testModel.plugin = testPlugin; var statusChangedSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); @@ -230,7 +230,7 @@ TestCase { } function test_cancel() { - var testModel = Qt.createQmlObject('import QtLocation 5.0; PlaceSearchModel {}', testCase, "PlaceSearchModel"); + var testModel = Qt.createQmlObject('import QtLocation 5.3; PlaceSearchModel {}', testCase, "PlaceSearchModel"); testModel.plugin = testPlugin; var statusChangedSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); @@ -274,7 +274,7 @@ TestCase { } function test_error() { - var testModel = Qt.createQmlObject('import QtLocation 5.0; PlaceSearchModel {}', testCase, "PlaceSearchModel"); + var testModel = Qt.createQmlObject('import QtLocation 5.3; PlaceSearchModel {}', testCase, "PlaceSearchModel"); var statusChangedSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); statusChangedSpy.target = testModel; diff --git a/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml b/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml index 51f348e3..2c20dd0f 100644 --- a/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml +++ b/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 import "utils.js" as Utils diff --git a/tests/auto/declarative_core/tst_plugin.qml b/tests/auto/declarative_core/tst_plugin.qml index abb5f796..5c4b32cf 100644 --- a/tests/auto/declarative_core/tst_plugin.qml +++ b/tests/auto/declarative_core/tst_plugin.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 Item { diff --git a/tests/auto/declarative_core/tst_ratings.qml b/tests/auto/declarative_core/tst_ratings.qml index 9075c1d4..00ebe065 100644 --- a/tests/auto/declarative_core/tst_ratings.qml +++ b/tests/auto/declarative_core/tst_ratings.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { diff --git a/tests/auto/declarative_core/tst_reviewmodel.qml b/tests/auto/declarative_core/tst_reviewmodel.qml index 62a7ac5e..187136e3 100644 --- a/tests/auto/declarative_core/tst_reviewmodel.qml +++ b/tests/auto/declarative_core/tst_reviewmodel.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { @@ -208,7 +208,7 @@ TestCase { } function createModel() { - return Qt.createQmlObject('import QtLocation 5.0; ReviewModel {}', + return Qt.createQmlObject('import QtLocation 5.3; ReviewModel {}', testCase, "reviewModel"); } } diff --git a/tests/auto/declarative_core/tst_supplier.qml b/tests/auto/declarative_core/tst_supplier.qml index a98bb79e..a412fde3 100644 --- a/tests/auto/declarative_core/tst_supplier.qml +++ b/tests/auto/declarative_core/tst_supplier.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { diff --git a/tests/auto/declarative_core/tst_user.qml b/tests/auto/declarative_core/tst_user.qml index f078a6e7..5d8fa063 100644 --- a/tests/auto/declarative_core/tst_user.qml +++ b/tests/auto/declarative_core/tst_user.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import "utils.js" as Utils TestCase { diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml index bf17a19f..df49df49 100644 --- a/tests/auto/declarative_ui/tst_map.qml +++ b/tests/auto/declarative_ui/tst_map.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 Item { diff --git a/tests/auto/declarative_ui/tst_map_coordinateanimation.qml b/tests/auto/declarative_ui/tst_map_coordinateanimation.qml index 54448973..e6d86b1e 100644 --- a/tests/auto/declarative_ui/tst_map_coordinateanimation.qml +++ b/tests/auto/declarative_ui/tst_map_coordinateanimation.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.3 Item { diff --git a/tests/auto/declarative_ui/tst_map_geocoding.qml b/tests/auto/declarative_ui/tst_map_geocoding.qml index 1f5f508a..3b40b94c 100644 --- a/tests/auto/declarative_ui/tst_map_geocoding.qml +++ b/tests/auto/declarative_ui/tst_map_geocoding.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 Item { diff --git a/tests/auto/declarative_ui/tst_map_item.qml b/tests/auto/declarative_ui/tst_map_item.qml index 80d5d132..544f27ed 100644 --- a/tests/auto/declarative_ui/tst_map_item.qml +++ b/tests/auto/declarative_ui/tst_map_item.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.test 5.0 import QtPositioning 5.0 diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml index ca7ca8c2..ee8f4608 100644 --- a/tests/auto/declarative_ui/tst_map_item_details.qml +++ b/tests/auto/declarative_ui/tst_map_item_details.qml @@ -42,7 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtPositioning 5.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.test 5.0 Item { 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 7c32fd65..d923f4f3 100644 --- a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml +++ b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 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 a24bd8c7..6a7c9faa 100644 --- a/tests/auto/declarative_ui/tst_map_itemview.qml +++ b/tests/auto/declarative_ui/tst_map_itemview.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 import QtLocation.test 5.0 @@ -310,13 +310,13 @@ Item { clear_data(); /* // basic create-destroy without items, mustn't crash - var dynamicMap = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.0; Map { x:0; y:0; objectName: \'dynomik map\'; width: masterItem.width; height: masterItem.height; plugin: testPlugin} ', masterItem, "dynamicCreationErrors" ); + var dynamicMap = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3; Map { x:0; y:0; objectName: \'dynomik map\'; width: masterItem.width; height: masterItem.height; plugin: testPlugin} ', masterItem, "dynamicCreationErrors" ); verify(dynamicMap !== null) dynamicMap.destroy(1) //wait(5) // add rm add, destroy with item on it - dynamicMap = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.0; Map { x:0; y:0; objectName: \'dynomik map\'; width: masterItem.width; height: masterItem.height; plugin: testPlugin} ', masterItem, "dynamicCreationErrors" ); + dynamicMap = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3; Map { x:0; y:0; objectName: \'dynomik map\'; width: masterItem.width; height: masterItem.height; plugin: testPlugin} ', masterItem, "dynamicCreationErrors" ); verify(dynamicMap !== null) dynamicMap.addMapItem(externalCircle); compare(dynamicMap.mapItems.length, 1) @@ -328,8 +328,8 @@ Item { //wait(5) // try adding same item to two maps, will not be allowed - var dynamicMap2 = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.0; Map { x:0; y:0; objectName: \'dynomik map2\'; width: masterItem.width; height: masterItem.height; plugin: testPlugin} ', masterItem, "dynamicCreationErrors" ); - dynamicMap = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.0; Map { x:0; y:0; objectName: \'dynomik map\'; width: masterItem.width; height: masterItem.height; plugin: testPlugin} ', masterItem, "dynamicCreationErrors" ); + var dynamicMap2 = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3; Map { x:0; y:0; objectName: \'dynomik map2\'; width: masterItem.width; height: masterItem.height; plugin: testPlugin} ', masterItem, "dynamicCreationErrors" ); + dynamicMap = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3; Map { x:0; y:0; objectName: \'dynomik map\'; width: masterItem.width; height: masterItem.height; plugin: testPlugin} ', masterItem, "dynamicCreationErrors" ); verify(dynamicMap !== null) verify(dynamicMap2 !== null) compare(dynamicMap.mapItems.length, 0) @@ -339,7 +339,7 @@ Item { compare(dynamicMap2.mapItems.length, 0) // create and destroy a dynamic item that is in the map - var dynamicCircle = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.0; MapCircle { objectName: \'dynamic circle 1\'; center { latitude: 5; longitude: 5 } radius: 15 } ', masterItem, "dynamicCreationErrors" ); + var dynamicCircle = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3; MapCircle { objectName: \'dynamic circle 1\'; center { latitude: 5; longitude: 5 } radius: 15 } ', masterItem, "dynamicCreationErrors" ); verify (dynamicCircle !== null) compare(map.mapItems.length, 0) map.addMapItem(dynamicCircle) @@ -371,7 +371,7 @@ Item { mapForView.removeMapItem(internalCircle) compare(mapForView.mapItems.length, 7) // Basic adding and removing of dynamic object - var dynamicCircle = Qt.createQmlObject( "import QtQuick 2.0; import QtLocation 5.0; MapCircle {radius: 4000; center: mapDefaultCenter}", map, ""); + var dynamicCircle = Qt.createQmlObject( "import QtQuick 2.0; import QtLocation 5.3; MapCircle {radius: 4000; center: mapDefaultCenter}", map, ""); mapForView.addMapItem(dynamicCircle) compare(mapForView.mapItems.length, 8) mapForView.removeMapItem(dynamicCircle) diff --git a/tests/auto/declarative_ui/tst_map_maptype.qml b/tests/auto/declarative_ui/tst_map_maptype.qml index 642091e9..e9a52d09 100644 --- a/tests/auto/declarative_ui/tst_map_maptype.qml +++ b/tests/auto/declarative_ui/tst_map_maptype.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 TestCase { id: testCase diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml index a8bff2e8..0e7c87a7 100644 --- a/tests/auto/declarative_ui/tst_map_mouse.qml +++ b/tests/auto/declarative_ui/tst_map_mouse.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 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 b2a2009d..bb6e1ee3 100644 --- a/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml +++ b/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 import QtLocation.test 5.0 diff --git a/tests/auto/qmlinterface/data/TestAddress.qml b/tests/auto/qmlinterface/data/TestAddress.qml index ef9a17a3..b3173734 100644 --- a/tests/auto/qmlinterface/data/TestAddress.qml +++ b/tests/auto/qmlinterface/data/TestAddress.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtLocation 5.0 +import QtLocation 5.3 Address { city: "Brisbane" diff --git a/tests/auto/qmlinterface/data/TestCategory.qml b/tests/auto/qmlinterface/data/TestCategory.qml index 95a9b616..1e9e4950 100644 --- a/tests/auto/qmlinterface/data/TestCategory.qml +++ b/tests/auto/qmlinterface/data/TestCategory.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtLocation 5.0 +import QtLocation 5.3 Category { name: "Test category" diff --git a/tests/auto/qmlinterface/data/TestContactDetail.qml b/tests/auto/qmlinterface/data/TestContactDetail.qml index 2575947d..1221a6e1 100644 --- a/tests/auto/qmlinterface/data/TestContactDetail.qml +++ b/tests/auto/qmlinterface/data/TestContactDetail.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtLocation 5.0 +import QtLocation 5.3 ContactDetail { label: "Test Contact Detail" diff --git a/tests/auto/qmlinterface/data/TestIcon.qml b/tests/auto/qmlinterface/data/TestIcon.qml index dd3b1391..e7902d5c 100644 --- a/tests/auto/qmlinterface/data/TestIcon.qml +++ b/tests/auto/qmlinterface/data/TestIcon.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 Icon { Component.onCompleted: { diff --git a/tests/auto/qmlinterface/data/TestLocation.qml b/tests/auto/qmlinterface/data/TestLocation.qml index f92bd51e..010fc9d0 100644 --- a/tests/auto/qmlinterface/data/TestLocation.qml +++ b/tests/auto/qmlinterface/data/TestLocation.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtLocation 5.0 +import QtLocation 5.3 Location { address: TestAddress { } diff --git a/tests/auto/qmlinterface/data/TestPlace.qml b/tests/auto/qmlinterface/data/TestPlace.qml index 90af9e15..d4691360 100644 --- a/tests/auto/qmlinterface/data/TestPlace.qml +++ b/tests/auto/qmlinterface/data/TestPlace.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtLocation 5.0 +import QtLocation 5.3 Place { name: "Test Place" diff --git a/tests/auto/qmlinterface/data/TestPlaceAttribute.qml b/tests/auto/qmlinterface/data/TestPlaceAttribute.qml index 2ba20a56..adbe987b 100644 --- a/tests/auto/qmlinterface/data/TestPlaceAttribute.qml +++ b/tests/auto/qmlinterface/data/TestPlaceAttribute.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtLocation 5.0 +import QtLocation 5.3 PlaceAttribute { label: "Test Attribute" diff --git a/tests/auto/qmlinterface/data/TestRatings.qml b/tests/auto/qmlinterface/data/TestRatings.qml index d793806d..53228de7 100644 --- a/tests/auto/qmlinterface/data/TestRatings.qml +++ b/tests/auto/qmlinterface/data/TestRatings.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtLocation 5.0 +import QtLocation 5.3 Ratings { average: 3.5 diff --git a/tests/auto/qmlinterface/data/TestSupplier.qml b/tests/auto/qmlinterface/data/TestSupplier.qml index 9f1d732a..7af33d1d 100644 --- a/tests/auto/qmlinterface/data/TestSupplier.qml +++ b/tests/auto/qmlinterface/data/TestSupplier.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtLocation 5.0 +import QtLocation 5.3 Supplier { name: "Test supplier" diff --git a/tests/auto/qmlinterface/data/TestUser.qml b/tests/auto/qmlinterface/data/TestUser.qml index 77428540..63d1f41a 100644 --- a/tests/auto/qmlinterface/data/TestUser.qml +++ b/tests/auto/qmlinterface/data/TestUser.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtLocation 5.0 +import QtLocation 5.3 User { name: "Test User" |