diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-24 09:32:58 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-26 16:29:38 +0100 |
commit | 10141bb44a438cf428ce2ba385b4f7ef3b6de0d8 (patch) | |
tree | a075ece1d77a48626650e63d38db3e6f17710964 | |
parent | 450793356b6f62b70a896b85011070760c5d1d56 (diff) | |
download | qtlocation-10141bb44a438cf428ce2ba385b4f7ef3b6de0d8.tar.gz |
Bump all qml code to QtLocation 5.3
It is the baseline for all subsequent additions.
Change-Id: Ia56da45b8b92dd0224dbeff97976cd06aa25d943
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
78 files changed, 134 insertions, 134 deletions
diff --git a/examples/location/mapviewer/content/dialogs/RouteDialog.qml b/examples/location/mapviewer/content/dialogs/RouteDialog.qml index 73e5f3d1..e7be04ef 100644 --- a/examples/location/mapviewer/content/dialogs/RouteDialog.qml +++ b/examples/location/mapviewer/content/dialogs/RouteDialog.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 Dialog { diff --git a/examples/location/mapviewer/content/map/3dItem.qml b/examples/location/mapviewer/content/map/3dItem.qml index 4c190429..43126476 100644 --- a/examples/location/mapviewer/content/map/3dItem.qml +++ b/examples/location/mapviewer/content/map/3dItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.0; -import QtLocation 5.0 +import QtLocation 5.3 import QtQuick 2.0 import Qt3D 2.0 import Qt3D.Shapes 2.0 diff --git a/examples/location/mapviewer/content/map/CircleItem.qml b/examples/location/mapviewer/content/map/CircleItem.qml index d7f03402..df618d4c 100644 --- a/examples/location/mapviewer/content/map/CircleItem.qml +++ b/examples/location/mapviewer/content/map/CircleItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 //TODO: remove/refactor me when items are integrated diff --git a/examples/location/mapviewer/content/map/ImageItem.qml b/examples/location/mapviewer/content/map/ImageItem.qml index 81e9f1c1..580799f0 100644 --- a/examples/location/mapviewer/content/map/ImageItem.qml +++ b/examples/location/mapviewer/content/map/ImageItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.0; -import QtLocation 5.0 +import QtLocation 5.3 MapQuickItem { //to be used inside MapComponent only id: imageItem diff --git a/examples/location/mapviewer/content/map/MapComponent.qml b/examples/location/mapviewer/content/map/MapComponent.qml index 505c795a..211e245f 100644 --- a/examples/location/mapviewer/content/map/MapComponent.qml +++ b/examples/location/mapviewer/content/map/MapComponent.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 import QtLocation.examples 5.0 diff --git a/examples/location/mapviewer/content/map/Marker.qml b/examples/location/mapviewer/content/map/Marker.qml index 0e9f1537..0793f13e 100644 --- a/examples/location/mapviewer/content/map/Marker.qml +++ b/examples/location/mapviewer/content/map/Marker.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0; -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 //! [mqi-top] diff --git a/examples/location/mapviewer/content/map/MiniMap.qml b/examples/location/mapviewer/content/map/MiniMap.qml index 5bee404c..90840980 100644 --- a/examples/location/mapviewer/content/map/MiniMap.qml +++ b/examples/location/mapviewer/content/map/MiniMap.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 Rectangle{ id: miniMapRect diff --git a/examples/location/mapviewer/content/map/PolygonItem.qml b/examples/location/mapviewer/content/map/PolygonItem.qml index 9b52bbca..d2734fdd 100644 --- a/examples/location/mapviewer/content/map/PolygonItem.qml +++ b/examples/location/mapviewer/content/map/PolygonItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 //TODO: remove me when items are integrated diff --git a/examples/location/mapviewer/content/map/PolylineItem.qml b/examples/location/mapviewer/content/map/PolylineItem.qml index f065142e..48bcae3a 100644 --- a/examples/location/mapviewer/content/map/PolylineItem.qml +++ b/examples/location/mapviewer/content/map/PolylineItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 //TODO: remove/refactor me when items are integrated diff --git a/examples/location/mapviewer/content/map/RectangleItem.qml b/examples/location/mapviewer/content/map/RectangleItem.qml index 1b58f468..6b81c017 100644 --- a/examples/location/mapviewer/content/map/RectangleItem.qml +++ b/examples/location/mapviewer/content/map/RectangleItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 MapRectangle { id: mapRectangle diff --git a/examples/location/mapviewer/content/map/VideoItem.qml b/examples/location/mapviewer/content/map/VideoItem.qml index a3df3c99..97963a1f 100644 --- a/examples/location/mapviewer/content/map/VideoItem.qml +++ b/examples/location/mapviewer/content/map/VideoItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.0; -import QtLocation 5.0 +import QtLocation 5.3 import QtMultimedia 5.0 // NOTE: If the creation of this compoment fails, make sure you have the latest diff --git a/examples/location/mapviewer/mapviewer.qml b/examples/location/mapviewer/mapviewer.qml index 59a5de5c..9481676a 100644 --- a/examples/location/mapviewer/mapviewer.qml +++ b/examples/location/mapviewer/mapviewer.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtPositioning 5.2 import QtLocation.examples 5.0 import "content/map" @@ -546,9 +546,9 @@ Item { function createMap(provider){ var plugin if (parameters.length>0) - plugin = Qt.createQmlObject ('import QtLocation 5.0; Plugin{ name:"' + provider + '"; parameters: page.parameters}', page) + plugin = Qt.createQmlObject ('import QtLocation 5.3; Plugin{ name:"' + provider + '"; parameters: page.parameters}', page) else - plugin = Qt.createQmlObject ('import QtLocation 5.0; Plugin{ name:"' + provider + '"}', page) + plugin = Qt.createQmlObject ('import QtLocation 5.3; Plugin{ name:"' + provider + '"}', page) if (plugin.supportsMapping() && plugin.supportsGeocoding(Plugin.ReverseGeocodingFeature) && plugin.supportsRouting()) { @@ -558,7 +558,7 @@ Item { minimap = null } - map = Qt.createQmlObject ('import QtLocation 5.0;\ + map = Qt.createQmlObject ('import QtLocation 5.3;\ import "content/map";\ MapComponent{\ z : backgroundRect.z + 1;\ @@ -611,11 +611,11 @@ Item { } function getPlugins(){ - var plugin = Qt.createQmlObject ('import QtLocation 5.0; Plugin {}', page) + var plugin = Qt.createQmlObject ('import QtLocation 5.3; Plugin {}', page) var tempPlugin var myArray = new Array() for (var i = 0; i<plugin.availableServiceProviders.length; i++){ - tempPlugin = Qt.createQmlObject ('import QtLocation 5.0; Plugin {name: "' + plugin.availableServiceProviders[i]+ '"}', page) + tempPlugin = Qt.createQmlObject ('import QtLocation 5.3; Plugin {name: "' + plugin.availableServiceProviders[i]+ '"}', page) if (tempPlugin.supportsMapping() && tempPlugin.supportsGeocoding(Plugin.ReverseGeocodingFeature) @@ -630,7 +630,7 @@ Item { function setPluginParameters(pluginParameters) { var parameters = new Array() for (var prop in pluginParameters){ - var parameter = Qt.createQmlObject('import QtLocation 5.0; PluginParameter{ name: "'+ prop + '"; value: "' + pluginParameters[prop]+'"}',page) + var parameter = Qt.createQmlObject('import QtLocation 5.3; PluginParameter{ name: "'+ prop + '"; value: "' + pluginParameters[prop]+'"}',page) parameters.push(parameter) } page.parameters=parameters diff --git a/examples/location/places/content/places/CategoryDelegate.qml b/examples/location/places/content/places/CategoryDelegate.qml index 4bb2b8e0..b9251721 100644 --- a/examples/location/places/content/places/CategoryDelegate.qml +++ b/examples/location/places/content/places/CategoryDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 Item { diff --git a/examples/location/places/content/places/CategoryDialog.qml b/examples/location/places/content/places/CategoryDialog.qml index 289d8501..1c122ff8 100644 --- a/examples/location/places/content/places/CategoryDialog.qml +++ b/examples/location/places/content/places/CategoryDialog.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 InputDialog { @@ -60,7 +60,7 @@ InputDialog { //! [Category save] onGoButtonClicked: { - var modifiedCategory = category ? category : Qt.createQmlObject('import QtLocation 5.0; Category { }', page); + var modifiedCategory = category ? category : Qt.createQmlObject('import QtLocation 5.3; Category { }', page); modifiedCategory.plugin = placesPlugin; modifiedCategory.name = dialogModel.get(0).inputText; diff --git a/examples/location/places/content/places/CategoryView.qml b/examples/location/places/content/places/CategoryView.qml index 9b28e892..a4eed527 100644 --- a/examples/location/places/content/places/CategoryView.qml +++ b/examples/location/places/content/places/CategoryView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 diff --git a/examples/location/places/content/places/EditorialDelegate.qml b/examples/location/places/content/places/EditorialDelegate.qml index fa33bcf0..95f6760b 100644 --- a/examples/location/places/content/places/EditorialDelegate.qml +++ b/examples/location/places/content/places/EditorialDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 Item { id: root diff --git a/examples/location/places/content/places/EditorialPage.qml b/examples/location/places/content/places/EditorialPage.qml index 60f175d3..e368a578 100644 --- a/examples/location/places/content/places/EditorialPage.qml +++ b/examples/location/places/content/places/EditorialPage.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 Item { anchors.fill: parent diff --git a/examples/location/places/content/places/MapComponent.qml b/examples/location/places/content/places/MapComponent.qml index 00ba9b2e..17400a2f 100644 --- a/examples/location/places/content/places/MapComponent.qml +++ b/examples/location/places/content/places/MapComponent.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtPositioning 5.2 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 Map { diff --git a/examples/location/places/content/places/OptionsDialog.qml b/examples/location/places/content/places/OptionsDialog.qml index 7b7c9266..b90e58b9 100644 --- a/examples/location/places/content/places/OptionsDialog.qml +++ b/examples/location/places/content/places/OptionsDialog.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 Dialog { diff --git a/examples/location/places/content/places/PlaceDelegate.qml b/examples/location/places/content/places/PlaceDelegate.qml index 90a2cceb..225118db 100644 --- a/examples/location/places/content/places/PlaceDelegate.qml +++ b/examples/location/places/content/places/PlaceDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 import "PlacesUtils.js" as PlacesUtils diff --git a/examples/location/places/content/places/PlaceDialog.qml b/examples/location/places/content/places/PlaceDialog.qml index ed08716d..ae7f55e6 100644 --- a/examples/location/places/content/places/PlaceDialog.qml +++ b/examples/location/places/content/places/PlaceDialog.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 Dialog { @@ -52,7 +52,7 @@ Dialog { function prepareDialog(inputPlace) { if (!inputPlace) { - locationPlace = Qt.createQmlObject('import QtLocation 5.0; Place { }', root); + locationPlace = Qt.createQmlObject('import QtLocation 5.3; Place { }', root); __createdPlace = true; } else { locationPlace = inputPlace; @@ -135,22 +135,22 @@ Dialog { var c = QtPositioning.coordinate(parseFloat(dataFieldsModel.get(9).inputText), parseFloat(dataFieldsModel.get(10).inputText)); locationPlace.location.coordinate = c; - var phone = Qt.createQmlObject('import QtLocation 5.0; ContactDetail { }', locationPlace); + var phone = Qt.createQmlObject('import QtLocation 5.3; ContactDetail { }', locationPlace); phone.label = "Phone"; phone.value = dataFieldsModel.get(11).inputText; locationPlace.contactDetails.phone = phone; - var fax = Qt.createQmlObject('import QtLocation 5.0; ContactDetail { }', locationPlace); + var fax = Qt.createQmlObject('import QtLocation 5.3; ContactDetail { }', locationPlace); fax.label = "Fax"; fax.value = dataFieldsModel.get(12).inputText; locationPlace.contactDetails.fax = fax; - var email = Qt.createQmlObject('import QtLocation 5.0; ContactDetail { }', locationPlace); + var email = Qt.createQmlObject('import QtLocation 5.3; ContactDetail { }', locationPlace); email.label = "Email"; email.value = dataFieldsModel.get(13).inputText; locationPlace.contactDetails.email = email; - var website = Qt.createQmlObject('import QtLocation 5.0; ContactDetail { }', locationPlace); + var website = Qt.createQmlObject('import QtLocation 5.3; ContactDetail { }', locationPlace); website.label = "Website"; website.value = dataFieldsModel.get(14).inputText; locationPlace.contactDetails.website = website; diff --git a/examples/location/places/content/places/PlaceEditorials.qml b/examples/location/places/content/places/PlaceEditorials.qml index 06cff09c..db6141a8 100644 --- a/examples/location/places/content/places/PlaceEditorials.qml +++ b/examples/location/places/content/places/PlaceEditorials.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 Item { anchors.fill: parent diff --git a/examples/location/places/content/places/PlaceImages.qml b/examples/location/places/content/places/PlaceImages.qml index be18a923..327a5769 100644 --- a/examples/location/places/content/places/PlaceImages.qml +++ b/examples/location/places/content/places/PlaceImages.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 Item { id: root diff --git a/examples/location/places/content/places/PlaceReviews.qml b/examples/location/places/content/places/PlaceReviews.qml index 3d54c52c..673f9769 100644 --- a/examples/location/places/content/places/PlaceReviews.qml +++ b/examples/location/places/content/places/PlaceReviews.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 Item { anchors.fill: parent diff --git a/examples/location/places/content/places/ReviewDelegate.qml b/examples/location/places/content/places/ReviewDelegate.qml index 50753e09..3cdb16b3 100644 --- a/examples/location/places/content/places/ReviewDelegate.qml +++ b/examples/location/places/content/places/ReviewDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 Item { id: root diff --git a/examples/location/places/content/places/ReviewPage.qml b/examples/location/places/content/places/ReviewPage.qml index c7287e19..89cf116e 100644 --- a/examples/location/places/content/places/ReviewPage.qml +++ b/examples/location/places/content/places/ReviewPage.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 Item { anchors.fill: parent diff --git a/examples/location/places/content/places/SearchBox.qml b/examples/location/places/content/places/SearchBox.qml index 335af339..35f0f7a8 100644 --- a/examples/location/places/content/places/SearchBox.qml +++ b/examples/location/places/content/places/SearchBox.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 Rectangle { diff --git a/examples/location/places/content/places/SearchResultDelegate.qml b/examples/location/places/content/places/SearchResultDelegate.qml index 76b64e83..cea8b471 100644 --- a/examples/location/places/content/places/SearchResultDelegate.qml +++ b/examples/location/places/content/places/SearchResultDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import "PlacesUtils.js" as PlacesUtils Item { diff --git a/examples/location/places/content/places/SearchResultView.qml b/examples/location/places/content/places/SearchResultView.qml index da62a5c5..ffe96c8d 100644 --- a/examples/location/places/content/places/SearchResultView.qml +++ b/examples/location/places/content/places/SearchResultView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 Item { diff --git a/examples/location/places/places.qml b/examples/location/places/places.qml index 4a144d55..3ed7a7cc 100644 --- a/examples/location/places/places.qml +++ b/examples/location/places/places.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtPositioning 5.2 -import QtLocation 5.0 +import QtLocation 5.3 import QtLocation.examples 5.0 import "content/places" @@ -264,7 +264,7 @@ Item { searchRegionItem.destroy(); } - searchRegionItem = Qt.createQmlObject('import QtLocation 5.0; MapRectangle { color: "red"; opacity: 0.4 }', page, "MapRectangle"); + searchRegionItem = Qt.createQmlObject('import QtLocation 5.3; MapRectangle { color: "red"; opacity: 0.4 }', page, "MapRectangle"); searchRegionItem.topLeft = r.topLeft; searchRegionItem.bottomRight = r.bottomRight; map.addMapItem(searchRegionItem); @@ -306,7 +306,7 @@ Item { searchRegionItem.destroy(); } - searchRegionItem = Qt.createQmlObject('import QtLocation 5.0; MapCircle { color: "red"; opacity: 0.4 }', page, "MapRectangle"); + searchRegionItem = Qt.createQmlObject('import QtLocation 5.3; MapCircle { color: "red"; opacity: 0.4 }', page, "MapRectangle"); searchRegionItem.center = circle.center; searchRegionItem.radius = circle.radius; map.addMapItem(searchRegionItem); @@ -336,7 +336,7 @@ Item { onGoButtonClicked: { /*if (isFavoritesEnabled) { if (favoritesPlugin == null) - favoritesPlugin = Qt.createQmlObject('import QtLocation 5.0; Plugin { name: "places_jsondb" }', page); + favoritesPlugin = Qt.createQmlObject('import QtLocation 5.3; Plugin { name: "places_jsondb" }', page); favoritesPlugin.parameters = pluginParametersFromMap(pluginParameters); placeSearchModel.favoritesPlugin = favoritesPlugin; } else { @@ -536,7 +536,7 @@ Item { if (placesPlugin.supportsMapping()) { mapPlugin = placesPlugin; } else { - mapPlugin = Qt.createQmlObject('import QtLocation 5.0; Plugin { required.mapping: Plugin.AnyMappingFeatures;' + + mapPlugin = Qt.createQmlObject('import QtLocation 5.3; Plugin { required.mapping: Plugin.AnyMappingFeatures;' + 'parameters: pluginParametersFromMap(pluginParameters) }', page); } @@ -547,10 +547,10 @@ Item { } function getPlacesPlugins() { - var plugin = Qt.createQmlObject('import QtLocation 5.0; Plugin {}', page); + var plugin = Qt.createQmlObject('import QtLocation 5.3; Plugin {}', page); var myArray = new Array; for (var i = 0; i < plugin.availableServiceProviders.length; i++) { - var tempPlugin = Qt.createQmlObject ('import QtLocation 5.0; Plugin {name: "' + plugin.availableServiceProviders[i]+ '"}', page) + var tempPlugin = Qt.createQmlObject ('import QtLocation 5.3; Plugin {name: "' + plugin.availableServiceProviders[i]+ '"}', page) if (tempPlugin.supportsPlaces()) myArray.push(tempPlugin.name) @@ -562,7 +562,7 @@ Item { function pluginParametersFromMap(pluginParameters) { var parameters = new Array() for (var prop in pluginParameters){ - var parameter = Qt.createQmlObject('import QtLocation 5.0; PluginParameter{ name: "'+ prop + '"; value: "' + pluginParameters[prop]+'"}',page) + var parameter = Qt.createQmlObject('import QtLocation 5.3; PluginParameter{ name: "'+ prop + '"; value: "' + pluginParameters[prop]+'"}',page) parameters.push(parameter) } return parameters diff --git a/examples/location/places_list/places_list.qml b/examples/location/places_list/places_list.qml index d3911d3c..45c4712f 100644 --- a/examples/location/places_list/places_list.qml +++ b/examples/location/places_list/places_list.qml @@ -41,7 +41,7 @@ //! [Imports] import QtQuick 2.0 import QtPositioning 5.2 -import QtLocation 5.0 +import QtLocation 5.3 //! [Imports] Rectangle { diff --git a/examples/location/places_map/places_map.qml b/examples/location/places_map/places_map.qml index 87a254a8..e6ceafe8 100644 --- a/examples/location/places_map/places_map.qml +++ b/examples/location/places_map/places_map.qml @@ -41,7 +41,7 @@ //! [Imports] import QtQuick 2.0 import QtPositioning 5.2 -import QtLocation 5.0 +import QtLocation 5.3 //! [Imports] Rectangle { diff --git a/src/location/doc/snippets/declarative/maps.qml b/src/location/doc/snippets/declarative/maps.qml index 1a6d78fc..4143a409 100644 --- a/src/location/doc/snippets/declarative/maps.qml +++ b/src/location/doc/snippets/declarative/maps.qml @@ -43,7 +43,7 @@ import QtQuick 2.0 //! [QtQuick import] import QtPositioning 5.2 //! [QtLocation import] -import QtLocation 5.0 +import QtLocation 5.3 //! [QtLocation import] Item { @@ -88,7 +88,7 @@ Item { property MapCircle circle Component.onCompleted: { - circle = Qt.createQmlObject('import QtLocation 5.0; MapCircle {}', page) + circle = Qt.createQmlObject('import QtLocation 5.3; MapCircle {}', page) circle.center = positionSource.position.coordinate circle.radius = 5000.0 circle.color = 'green' diff --git a/src/location/doc/snippets/declarative/places.qml b/src/location/doc/snippets/declarative/places.qml index 6f32ddaf..68349540 100644 --- a/src/location/doc/snippets/declarative/places.qml +++ b/src/location/doc/snippets/declarative/places.qml @@ -43,7 +43,7 @@ import QtQuick 2.0 //! [QtQuick import] //! [QtLocation import] import QtPositioning 5.2 -import QtLocation 5.0 +import QtLocation 5.3 //! [QtLocation import] Item { @@ -105,7 +105,7 @@ Item { function writeExtendedAttributes() { //! [ExtendedAttributes write] //assign a new attribute to a place - var smokingAttrib = Qt.createQmlObject('import QtLocation 5.0; PlaceAttribute {}', place); + var smokingAttrib = Qt.createQmlObject('import QtLocation 5.3; PlaceAttribute {}', place); smokingAttrib.label = "Smoking Allowed" smokingAttrib.text = "No" place.extendedAttributes.smoking = smokingAttrib; @@ -273,7 +273,7 @@ Item { //! [ContactDetails write single] function writeSingle() { - var phoneNumber = Qt.createQmlObject('import QtLocation 5.0; ContactDetail {}', place); + var phoneNumber = Qt.createQmlObject('import QtLocation 5.3; ContactDetail {}', place); phoneNumber.label = "Phone"; phoneNumber.value = "555-5555" place.contactDetails.phone = phoneNumber; @@ -282,11 +282,11 @@ Item { //! [ContactDetails write multiple] function writeMultiple() { - var bob = Qt.createQmlObject('import QtLocation 5.0; ContactDetail {}', place); + var bob = Qt.createQmlObject('import QtLocation 5.3; ContactDetail {}', place); bob.label = "Bob"; bob.value = "555-5555" - var alice = Qt.createQmlObject('import QtLocation 5.0; ContactDetail {}', place); + var alice = Qt.createQmlObject('import QtLocation 5.3; ContactDetail {}', place); alice.label = "Alice"; alice.value = "555-8745" @@ -362,7 +362,7 @@ Item { function createAndSavePlace() { //! [Place createAndSavePlace] //creating and saving a place - var place = Qt.createQmlObject('import QtLocation 5.0; Place { }', parent); + var place = Qt.createQmlObject('import QtLocation 5.3; Place { }', parent); place.plugin = myPlugin; place.name = "New York"; place.location.coordinate.latitude = 40.7 @@ -380,7 +380,7 @@ Item { function saveToNewPlugin() { //! [Place save to different plugin] - place = Qt.createQmlObject('import QtLocation 5.0; Place { }', parent); + place = Qt.createQmlObject('import QtLocation 5.3; Place { }', parent); place.plugin = destinationPlugin; place.copyFrom(originalPlace); place.save(); diff --git a/src/location/doc/snippets/declarative/places_loader.qml b/src/location/doc/snippets/declarative/places_loader.qml index 13bfc74b..d14223fd 100644 --- a/src/location/doc/snippets/declarative/places_loader.qml +++ b/src/location/doc/snippets/declarative/places_loader.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtPositioning 5.2 -import QtLocation 5.0 +import QtLocation 5.3 Rectangle { width: 360 diff --git a/src/location/doc/snippets/declarative/plugin.qml b/src/location/doc/snippets/declarative/plugin.qml index 64b2a55a..889f9dfb 100644 --- a/src/location/doc/snippets/declarative/plugin.qml +++ b/src/location/doc/snippets/declarative/plugin.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 //! [Plugin import] -import QtLocation 5.0 +import QtLocation 5.3 //! [Plugin import] Item { diff --git a/src/location/doc/snippets/declarative/routing.qml b/src/location/doc/snippets/declarative/routing.qml index 04258bdd..c2a40179 100644 --- a/src/location/doc/snippets/declarative/routing.qml +++ b/src/location/doc/snippets/declarative/routing.qml @@ -42,7 +42,7 @@ import QtQuick 2.0 //! [QtQuick import] //! [QtLocation import] -import QtLocation 5.0 +import QtLocation 5.3 //! [QtLocation import] Item { diff --git a/src/location/doc/src/qml-maps.qdoc b/src/location/doc/src/qml-maps.qdoc index 460ec170..87a2662a 100644 --- a/src/location/doc/src/qml-maps.qdoc +++ b/src/location/doc/src/qml-maps.qdoc @@ -69,7 +69,7 @@ to center a \l{Map}{map} on the current position: Rectangle { import QtPositioning 5.2 - import QtLocation 5.0 + import QtLocation 5.3 ... map : Map { diff --git a/src/location/doc/src/qtlocation-qml.qdoc b/src/location/doc/src/qtlocation-qml.qdoc index ed280dfb..2aea6643 100644 --- a/src/location/doc/src/qtlocation-qml.qdoc +++ b/src/location/doc/src/qtlocation-qml.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule QtLocation 5.0 + \qmlmodule QtLocation 5.3 \title Qt Location QML Types \ingroup qmlmodules \brief Provides QML types for mapping and location information diff --git a/src/location/doc/src/qtlocation.qdoc b/src/location/doc/src/qtlocation.qdoc index dc3fc14d..032f5448 100644 --- a/src/location/doc/src/qtlocation.qdoc +++ b/src/location/doc/src/qtlocation.qdoc @@ -40,7 +40,7 @@ To load the Qt Location module, add the following statement to your .qml files \code - import QtLocation 5.0 + import QtLocation 5.3 \endcode For C++ projects include the header appropriate for the current use case, @@ -86,7 +86,7 @@ for navigation and awareness of objects that may aid or hinder a journey. To load the Qt Location module, add the following statement to your .qml files \code - import QtLocation 5.0 + import QtLocation 5.3 \endcode For C++ projects include the header appropriate for the current use case, 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" |