diff options
Diffstat (limited to 'tests/auto/declarative_ui')
-rw-r--r-- | tests/auto/declarative_ui/tst_map.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_coordinateanimation.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_geocoding.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_item.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_item_details.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_item_fit_viewport.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_itemview.qml | 14 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_maptype.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_mouse.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative_ui/tst_map_pinch_and_flick.qml | 2 |
10 files changed, 16 insertions, 16 deletions
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 |