2 files changed, 5 insertions, 26 deletions
diff --git a/platform/qt/include/qquickmapboxgl.hpp b/platform/qt/include/qquickmapboxgl.hpp
index c651afef00..325a5f99dd 100644
--- a/platform/qt/include/qquickmapboxgl.hpp
+++ b/platform/qt/include/qquickmapboxgl.hpp
@@ -34,19 +34,6 @@ class Q_DECL_EXPORT QQuickMapboxGL : public QQuickFramebufferObject
     Q_PROPERTY(qreal pitch READ pitch WRITE setPitch NOTIFY pitchChanged)
 
 public:
-    struct LayoutPropertyChange {
-        QString layer;
-        QString property;
-        QVariant value;
-    };
-
-    struct PaintPropertyChange {
-        QString layer;
-        QString property;
-        QVariant value;
-        QString klass;
-    };
-
     QQuickMapboxGL(QQuickItem *parent = 0);
     virtual ~QQuickMapboxGL();
 
@@ -82,8 +69,8 @@ public:
 
     Q_INVOKABLE void pan(int dx, int dy);
 
-    QList<LayoutPropertyChange>& layoutPropertyChanges() { return m_layoutChanges; }
-    QList<PaintPropertyChange>& paintPropertyChanges() { return m_paintChanges; }
+    QList<QVariantMap>& layoutPropertyChanges() { return m_layoutChanges; }
+    QList<QVariantMap>& paintPropertyChanges() { return m_paintChanges; }
 
     // MapboxGL QML Type interface.
     void setStyle(const QString &style);
@@ -97,9 +84,6 @@ public:
 
     QPointF swapPan();
 
-    void setLayoutProperty(const QString &layer, const QString &property, const QVariant &value);
-    void setPaintProperty(const QString &layer, const QString &property, const QVariant &value, const QString &klass = QString());
-
     enum SyncState {
         NothingNeedsSync = 0,
         ZoomNeedsSync    = 1 << 0,
@@ -142,8 +126,8 @@ private:
     QGeoCoordinate m_center;
     QGeoShape m_visibleRegion;
     QColor m_color;
-    QList<LayoutPropertyChange> m_layoutChanges;
-    QList<PaintPropertyChange> m_paintChanges;
+    QList<QVariantMap> m_layoutChanges;
+    QList<QVariantMap> m_paintChanges;
 
     QString m_style;
     qreal m_bearing = 0;
diff --git a/platform/qt/include/qquickmapboxglstyleproperty.hpp b/platform/qt/include/qquickmapboxglstyleproperty.hpp
index 99832eed85..f7762b4ee6 100644
--- a/platform/qt/include/qquickmapboxglstyleproperty.hpp
+++ b/platform/qt/include/qquickmapboxglstyleproperty.hpp
@@ -35,9 +35,7 @@ protected:
     QQuickMapboxGLStyleProperty(QQuickItem *parent);
     virtual void updateParent() = 0;
 
-    QVariant m_layer;
-    QVariant m_property;
-    QVariant m_value;
+    QVariantMap m_map;
 };
 
 class Q_DECL_EXPORT QQuickMapboxGLLayoutStyleProperty : public QQuickMapboxGLStyleProperty
@@ -67,9 +65,6 @@ signals:
 
 protected:
     virtual void updateParent();
-
-private:
-    QVariant m_class;
 };
 
 #endif // QQUICKMAPBOXGLSTYLEPROPERTY_H