Mapbox GL: Add mapboxgl.china plugin parameter

Adds support for setting up Mapbox China API base URL + China
government-approved styles.

Change-Id: I66d9e15f336804466285e0996b0e326ef288be44
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
index 4614de89..ed36cd5f 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
@@ -378,7 +378,7 @@ QString QGeoMapMapboxGL::copyrightsStyleSheet() const
     return QStringLiteral("* { vertical-align: middle; font-weight: normal }");
 }
 
-void QGeoMapMapboxGL::setMapboxGLSettings(const QMapboxGLSettings& settings)
+void QGeoMapMapboxGL::setMapboxGLSettings(const QMapboxGLSettings& settings, bool useChinaEndpoint)
 {
     Q_D(QGeoMapMapboxGL);
 
@@ -386,8 +386,13 @@ void QGeoMapMapboxGL::setMapboxGLSettings(const QMapboxGLSettings& settings)
 
     // If the access token is not set, use the development access token.
     // This will only affect mapbox:// styles.
+    // Mapbox China requires a China-specific access token.
     if (d->m_settings.accessToken().isEmpty()) {
-        d->m_settings.setAccessToken(developmentToken);
+        if (useChinaEndpoint) {
+            qWarning("Mapbox China requires an access token: https://www.mapbox.com/contact/sales");
+        } else {
+            d->m_settings.setAccessToken(developmentToken);
+        }
     }
 }