summaryrefslogtreecommitdiff
path: root/src/location/doc/src/plugins/mapboxgl.qdoc
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-07 03:01:46 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-07 03:01:46 +0200
commita8793c6d9695498b3a53793f21859421262b4541 (patch)
treea783f6f0a1bd6c8dc5c4c57438da981e6b5dd17f /src/location/doc/src/plugins/mapboxgl.qdoc
parentb06a07cf9fd474e11fbe467047e5fe0322b677f0 (diff)
parenteda2a7c286058176e1906d0ddc88d4e2cfbec55e (diff)
downloadqtlocation-a8793c6d9695498b3a53793f21859421262b4541.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If3ebc0821be0d0206522adf8ff10040e80e34414
Diffstat (limited to 'src/location/doc/src/plugins/mapboxgl.qdoc')
-rw-r--r--src/location/doc/src/plugins/mapboxgl.qdoc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc
index e3ca1a82..3bfd8b97 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