[Qt] Allow setting the style via QML

2 files changed, 24 insertions, 1 deletions

diff --git a/platform/qt/src/qquickmapboxgl.cpp b/platform/qt/src/qquickmapboxgl.cpp
index b31055b587..2e6542ac15 100644
--- a/platform/qt/src/qquickmapboxgl.cpp
+++ b/platform/qt/src/qquickmapboxgl.cpp
@@ -3,6 +3,7 @@
 #include <QQuickMapboxGL>
 
 #include <QQuickItem>
+#include <QString>
 #include <QtGlobal>
 
 QQuickMapboxGL::QQuickMapboxGL(QQuickItem *parent_)
@@ -156,6 +157,25 @@ QColor QQuickMapboxGL::color() const
     return QColor();
 }
 
+void QQuickMapboxGL::setStyle(const QString &styleUrl)
+{
+    if (m_style == styleUrl) {
+        return;
+    }
+
+    m_style = styleUrl;
+
+    m_syncState |= StyleNeedsSync;
+    update();
+
+    emit styleChanged();
+}
+
+QString QQuickMapboxGL::style() const
+{
+    return m_style;
+}
+
 int QQuickMapboxGL::swapSyncState()
 {
     int oldState = m_syncState;
diff --git a/platform/qt/src/qquickmapboxglrenderer.cpp b/platform/qt/src/qquickmapboxglrenderer.cpp
index fc98cf35e1..20b5bf6d46 100644
--- a/platform/qt/src/qquickmapboxglrenderer.cpp
+++ b/platform/qt/src/qquickmapboxglrenderer.cpp
@@ -42,7 +42,6 @@ void QQuickMapboxGLRenderer::render()
 void QQuickMapboxGLRenderer::synchronize(QQuickFramebufferObject *item)
 {
     if (!m_initialized) {
-        m_map->setStyleURL(QMapbox::defaultStyles()[0].first);
         QObject::connect(m_map.data(), SIGNAL(needsRendering()), item, SLOT(update()));
         m_initialized = true;
     }
@@ -58,4 +57,8 @@ void QQuickMapboxGLRenderer::synchronize(QQuickFramebufferObject *item)
         const auto& center = quickMap->center();
         m_map->setCoordinate(QMapbox::Coordinate(center.latitude(), center.longitude()));
     }
+
+    if (syncStatus & QQuickMapboxGL::StyleNeedsSync) {
+        m_map->setStyleURL(quickMap->style());
+    }
 }