1 files changed, 16 insertions, 16 deletions

diff --git a/platform/qt/src/qquickmapboxglstyleproperty.cpp b/platform/qt/src/qquickmapboxglstyleproperty.cpp
index 77e6a00583..ffded9c9e7 100644
--- a/platform/qt/src/qquickmapboxglstyleproperty.cpp
+++ b/platform/qt/src/qquickmapboxglstyleproperty.cpp
@@ -18,13 +18,13 @@ QQuickMapboxGLPaintStyleProperty::QQuickMapboxGLPaintStyleProperty(QQuickItem *p
 
 void QQuickMapboxGLLayoutStyleProperty::updateParent()
 {
-    if (m_layer.isNull() || m_property.isNull() || m_value.isNull()) {
+    if (m_map.value("layer").isNull() || m_map.value("property").isNull() || m_map.value("value").isNull()) {
         return;
     }
 
     QQuickMapboxGL *map = qobject_cast<QQuickMapboxGL *>(parentItem());
     if (map) {
-        map->setLayoutProperty(layer(), property(), m_value);
+        map->setLayoutProperty(layer(), property(), value());
     } else {
         qWarning() << "Style property requires QQuickMapboxGL as parent item.";
     }
@@ -32,13 +32,13 @@ void QQuickMapboxGLLayoutStyleProperty::updateParent()
 
 void QQuickMapboxGLPaintStyleProperty::updateParent()
 {
-    if (m_layer.isNull() || m_property.isNull() || m_value.isNull()) {
+    if (m_map.value("layer").isNull() || m_map.value("property").isNull() || m_map.value("value").isNull()) {
         return;
     }
 
     QQuickMapboxGL *map = qobject_cast<QQuickMapboxGL *>(parentItem());
     if (map) {
-        map->setPaintProperty(layer(), property(), m_value, styleClass());
+        map->setPaintProperty(layer(), property(), value(), styleClass());
     } else {
         qWarning() << "Style property requires QQuickMapboxGL as parent item.";
     }
@@ -55,64 +55,64 @@ void QQuickMapboxGLStyleProperty::itemChange(QQuickItem::ItemChange change, cons
 
 void QQuickMapboxGLStyleProperty::setLayer(const QString &layer)
 {
-    if (layer == m_layer.toString()) {
+    if (m_map.value("layer").toString() == layer) {
         return;
     }
 
-    m_layer = layer;
+    m_map["layer"] = layer;
     emit layerChanged(layer);
     updateParent();
 }
 
 QString QQuickMapboxGLStyleProperty::layer() const
 {
-    return m_layer.toString();
+    return m_map.value("layer").toString();
 }
 
 void QQuickMapboxGLStyleProperty::setProperty(const QString &property)
 {
-    if (property == m_property.toString()) {
+    if (m_map.value("property").toString() == property) {
         return;
     }
 
-    m_property = property;
+    m_map["property"] = property;
     emit propertyChanged(property);
     updateParent();
 }
 
 QString QQuickMapboxGLStyleProperty::property() const
 {
-    return m_property.toString();
+    return m_map.value("property").toString();
 }
 
 void QQuickMapboxGLStyleProperty::setValue(const QVariant &value)
 {
-    if (value == m_value) {
+    if (m_map.value("value") == value) {
         return;
     }
 
-    m_value = value;
+    m_map["value"] = value;
     emit valueChanged(value);
     updateParent();
 }
 
 QVariant QQuickMapboxGLStyleProperty::value() const
 {
-    return m_value;
+    return m_map.value("value");
 }
 
 void QQuickMapboxGLPaintStyleProperty::setStyleClass(const QString &styleClass)
 {
-    if (styleClass == m_class.toString()) {
+    if (m_map.value("class").toString() == styleClass) {
         return;
     }
 
-    m_class = styleClass;
+    m_map["class"] = styleClass;
     emit classChanged(styleClass);
     updateParent();
 }
 
 QString QQuickMapboxGLPaintStyleProperty::styleClass() const
 {
-    return m_class.toString();
+    return m_map.value("class").toString();
 }