diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
commit | f55629245259ba7364e258f92408823024423caa (patch) | |
tree | f73063cf02dc175fbe9f0bfb48b3ddd686ea0f72 /examples | |
parent | 22d980c8124026eb712f563326d5a5c1b180c671 (diff) | |
parent | d89701c5c8646dedb0ebb2e011c4da796a6ae8a1 (diff) | |
download | qtlocation-f55629245259ba7364e258f92408823024423caa.tar.gz |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/plugins/geoservices/geoservices.pro
Change-Id: Ie82dd22c588e5cba409fc1ef31a65968ce9f719b
Diffstat (limited to 'examples')
-rw-r--r-- | examples/location/mapviewer/doc/images/mapviewer.png | bin | 359712 -> 176944 bytes | |||
-rw-r--r-- | examples/location/mapviewer/doc/src/mapviewer.qdoc | 4 | ||||
-rw-r--r-- | examples/location/mapviewer/map/MapComponent.qml | 4 | ||||
-rw-r--r-- | examples/location/mapviewer/mapviewer.pro | 1 | ||||
-rw-r--r-- | examples/location/minimal_map/doc/images/minimal_map.png | bin | 156053 -> 229975 bytes | |||
-rw-r--r-- | examples/location/minimal_map/main.qml | 8 | ||||
-rw-r--r-- | examples/location/places/doc/images/places.png | bin | 151611 -> 233430 bytes | |||
-rw-r--r-- | examples/location/places_map/doc/images/places_map.png | bin | 167995 -> 157761 bytes | |||
-rw-r--r-- | examples/location/places_map/places_map.qml | 2 | ||||
-rw-r--r-- | examples/location/planespotter/doc/images/planespotter.png | bin | 139390 -> 135872 bytes | |||
-rw-r--r-- | examples/location/planespotter/planespotter.qml | 2 |
11 files changed, 11 insertions, 10 deletions
diff --git a/examples/location/mapviewer/doc/images/mapviewer.png b/examples/location/mapviewer/doc/images/mapviewer.png Binary files differindex 4dc13f72..b55d7ff3 100644 --- a/examples/location/mapviewer/doc/images/mapviewer.png +++ b/examples/location/mapviewer/doc/images/mapviewer.png diff --git a/examples/location/mapviewer/doc/src/mapviewer.qdoc b/examples/location/mapviewer/doc/src/mapviewer.qdoc index 1fe0411c..2836ae0e 100644 --- a/examples/location/mapviewer/doc/src/mapviewer.qdoc +++ b/examples/location/mapviewer/doc/src/mapviewer.qdoc @@ -155,8 +155,8 @@ This is all that is required to display a Route on the Map. However, it is also useful to be able to retrieve the written directions and explanation of the travel route. In the example, these are displayed in a \l {ListView} element. - To create this content, we use a standard \l {Models and Views in Qt Quick#ListModel}{ListModel} and - \l {ListView} pair. The data in the \l {Models and Views in Qt Quick#ListModel}{ListModel} is + To create this content, we use a standard \l {Models and Views in Qt Quick#Models}{ListModel} and + \l {ListView} pair. The data in the \l {Models and Views in Qt Quick#Models}{ListModel} is built from the routeModel's output: \snippet mapviewer/forms/RouteList.qml routeinfomodel0 diff --git a/examples/location/mapviewer/map/MapComponent.qml b/examples/location/mapviewer/map/MapComponent.qml index c450a150..570505a0 100644 --- a/examples/location/mapviewer/map/MapComponent.qml +++ b/examples/location/mapviewer/map/MapComponent.qml @@ -604,9 +604,9 @@ Map { var mouseGeoPos = map.toCoordinate(Qt.point(mouse.x, mouse.y)); var preZoomPoint = map.fromCoordinate(mouseGeoPos, false); if (mouse.button === Qt.LeftButton) { - map.zoomLevel++; + map.zoomLevel = Math.floor(map.zoomLevel + 1) } else if (mouse.button === Qt.RightButton) { - map.zoomLevel--; + map.zoomLevel = Math.floor(map.zoomLevel - 1) } var postZoomPoint = map.fromCoordinate(mouseGeoPos, false); var dx = postZoomPoint.x - preZoomPoint.x; diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index 0dc4a705..90d85e62 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -2,6 +2,7 @@ TARGET = qml_location_mapviewer TEMPLATE = app QT += qml network quick positioning location +CONFIG += qtquickcompiler SOURCES += main.cpp RESOURCES += \ diff --git a/examples/location/minimal_map/doc/images/minimal_map.png b/examples/location/minimal_map/doc/images/minimal_map.png Binary files differindex 31ad0f8b..73a16fd5 100644 --- a/examples/location/minimal_map/doc/images/minimal_map.png +++ b/examples/location/minimal_map/doc/images/minimal_map.png diff --git a/examples/location/minimal_map/main.qml b/examples/location/minimal_map/main.qml index 26f24986..58b1c54f 100644 --- a/examples/location/minimal_map/main.qml +++ b/examples/location/minimal_map/main.qml @@ -49,8 +49,8 @@ Window { visible: true Plugin { - id: osmPlugin - name: "osm" + id: mapPlugin + name: "osm" // "mapboxgl", "esri", ... // specify plugin parameters if necessary // PluginParameter { // name: @@ -60,8 +60,8 @@ Window { Map { anchors.fill: parent - plugin: osmPlugin + plugin: mapPlugin center: QtPositioning.coordinate(59.91, 10.75) // Oslo - zoomLevel: 10 + zoomLevel: 14 } } diff --git a/examples/location/places/doc/images/places.png b/examples/location/places/doc/images/places.png Binary files differindex 0b1ac8b7..c8ada27d 100644 --- a/examples/location/places/doc/images/places.png +++ b/examples/location/places/doc/images/places.png diff --git a/examples/location/places_map/doc/images/places_map.png b/examples/location/places_map/doc/images/places_map.png Binary files differindex 4982df23..72317e2d 100644 --- a/examples/location/places_map/doc/images/places_map.png +++ b/examples/location/places_map/doc/images/places_map.png diff --git a/examples/location/places_map/places_map.qml b/examples/location/places_map/places_map.qml index e7d20e7b..467a31de 100644 --- a/examples/location/places_map/places_map.qml +++ b/examples/location/places_map/places_map.qml @@ -51,7 +51,7 @@ Rectangle { //! [Initialize Plugin] Plugin { id: myPlugin - name: "osm" + name: "osm" // "mapboxgl", "esri", ... //specify plugin parameters if necessary //PluginParameter {...} //PluginParameter {...} diff --git a/examples/location/planespotter/doc/images/planespotter.png b/examples/location/planespotter/doc/images/planespotter.png Binary files differindex dcfd55fe..f68f6f22 100644 --- a/examples/location/planespotter/doc/images/planespotter.png +++ b/examples/location/planespotter/doc/images/planespotter.png diff --git a/examples/location/planespotter/planespotter.qml b/examples/location/planespotter/planespotter.qml index 624a015e..62930ba7 100644 --- a/examples/location/planespotter/planespotter.qml +++ b/examples/location/planespotter/planespotter.qml @@ -62,7 +62,7 @@ Window { anchors.centerIn: parent; anchors.fill: parent plugin: Plugin { - name: "osm" + name: "osm" // "mapboxgl", "esri", ... } Plane { |