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 /examples/location/places/places.qml | |
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>
Diffstat (limited to 'examples/location/places/places.qml')
-rw-r--r-- | examples/location/places/places.qml | 16 |
1 files changed, 8 insertions, 8 deletions
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 |