summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/location/mapviewer/doc/images/mapviewer.pngbin359712 -> 176944 bytes
-rw-r--r--examples/location/minimal_map/doc/images/minimal_map.pngbin156053 -> 229975 bytes
-rw-r--r--examples/location/minimal_map/main.qml8
-rw-r--r--examples/location/places/doc/images/places.pngbin151611 -> 233430 bytes
-rw-r--r--examples/location/places_map/doc/images/places_map.pngbin167995 -> 157761 bytes
-rw-r--r--examples/location/places_map/places_map.qml2
-rw-r--r--examples/location/planespotter/doc/images/planespotter.pngbin139390 -> 135872 bytes
-rw-r--r--examples/location/planespotter/planespotter.qml2
-rw-r--r--src/location/declarativemaps/qdeclarativegeomap.cpp2
-rw-r--r--src/location/doc/src/qtlocation-examples.qdoc4
10 files changed, 9 insertions, 9 deletions
diff --git a/examples/location/mapviewer/doc/images/mapviewer.png b/examples/location/mapviewer/doc/images/mapviewer.png
index 4dc13f72..b55d7ff3 100644
--- a/examples/location/mapviewer/doc/images/mapviewer.png
+++ b/examples/location/mapviewer/doc/images/mapviewer.png
Binary files differ
diff --git a/examples/location/minimal_map/doc/images/minimal_map.png b/examples/location/minimal_map/doc/images/minimal_map.png
index 31ad0f8b..73a16fd5 100644
--- a/examples/location/minimal_map/doc/images/minimal_map.png
+++ b/examples/location/minimal_map/doc/images/minimal_map.png
Binary files differ
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
index 0b1ac8b7..c8ada27d 100644
--- a/examples/location/places/doc/images/places.png
+++ b/examples/location/places/doc/images/places.png
Binary files differ
diff --git a/examples/location/places_map/doc/images/places_map.png b/examples/location/places_map/doc/images/places_map.png
index 4982df23..72317e2d 100644
--- a/examples/location/places_map/doc/images/places_map.png
+++ b/examples/location/places_map/doc/images/places_map.png
Binary files differ
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
index dcfd55fe..f68f6f22 100644
--- a/examples/location/planespotter/doc/images/planespotter.png
+++ b/examples/location/planespotter/doc/images/planespotter.png
Binary files differ
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 {
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index 80a30f56..8ecd58b9 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -139,7 +139,7 @@ QT_BEGIN_NAMESPACE
\section2 Example Usage
The following snippet shows a simple Map and the necessary Plugin type
- to use it. The map is centered over Oslo, Norway, with zoom level 10.
+ to use it. The map is centered over Oslo, Norway, with zoom level 14.
\quotefromfile minimal_map/main.qml
\skipto import
diff --git a/src/location/doc/src/qtlocation-examples.qdoc b/src/location/doc/src/qtlocation-examples.qdoc
index 6155a6fd..052db15b 100644
--- a/src/location/doc/src/qtlocation-examples.qdoc
+++ b/src/location/doc/src/qtlocation-examples.qdoc
@@ -39,7 +39,7 @@
These examples can work with any of the available geo services plugins. However, some plugins may
require additional \l {QtLocation::PluginParameter}{plugin parameters} in order to function correctly.
The default plugin used by these examples is \l {Qt Location Open Street Map Plugin}, which does not
- require any parameters.
-
+ require any parameters. The \l {Qt Location Mapbox GL Plugin} was used for the screenshots and can also
+ be used without any parameters, for development purposes, on the platforms it is available.
*/