diff options
Diffstat (limited to 'examples/location')
32 files changed, 51 insertions, 51 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 { |