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/mapviewer | |
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/mapviewer')
12 files changed, 18 insertions, 18 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 |