summaryrefslogtreecommitdiff
path: root/src/location
diff options
context:
space:
mode:
Diffstat (limited to 'src/location')
-rw-r--r--src/location/doc/src/plugins/mapboxgl.qdoc4
-rw-r--r--src/location/labs/qdeclarativenavigator.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc
index 119868d1..f2cea8e8 100644
--- a/src/location/doc/src/plugins/mapboxgl.qdoc
+++ b/src/location/doc/src/plugins/mapboxgl.qdoc
@@ -88,6 +88,10 @@ The following table lists optional parameters that can be passed to the Mapbox p
\l{https://www.mapbox.com/tos}{Terms of Services} and must not be used in production. This property has
no effect on styles hosted outside the Mapbox servers.
\row
+ \li mapboxgl.api_base_url
+ \li Set a custom API base URL. When not set, the URL defaults to \l{https://api.mapbox.com}.
+ This parameter is ignored if the the \b mapboxgl.china property is set.
+\row
\li mapboxgl.china
\li Use Mapbox China API base URLs and styles.
Please notice that Mapbox China requires a specific access token. Contact \l
diff --git a/src/location/labs/qdeclarativenavigator.cpp b/src/location/labs/qdeclarativenavigator.cpp
index 69f450f3..546d0b01 100644
--- a/src/location/labs/qdeclarativenavigator.cpp
+++ b/src/location/labs/qdeclarativenavigator.cpp
@@ -52,9 +52,9 @@ QT_BEGIN_NAMESPACE
To use this module, import the module with the following line:
- \code
+ \qml
import Qt.labs.location 1.0
- \endcode
+ \endqml
\note These types are experimental and subject to source-incompatible changes from one
Qt minor release to the next, until they are ready to be moved to the stable QtLocation QML