1 files changed, 19 insertions, 6 deletions

diff --git a/src/quicktemplates2/qquickicon.cpp b/src/quicktemplates2/qquickicon.cpp
index 5a689108..bf0a4658 100644
--- a/src/quicktemplates2/qquickicon.cpp
+++ b/src/quicktemplates2/qquickicon.cpp
@@ -112,12 +112,14 @@ void QQuickIcon::setName(const QString &name)
     if ((d->resolveMask & QQuickIconPrivate::NameResolved) && d->name == name)
         return;
 
+    d.detach();
     d->name = name;
     d->resolveMask |= QQuickIconPrivate::NameResolved;
 }
 
 void QQuickIcon::resetName()
 {
+    d.detach();
     d->name = QString();
     d->resolveMask &= ~QQuickIconPrivate::NameResolved;
 }
@@ -132,12 +134,14 @@ void QQuickIcon::setSource(const QUrl &source)
     if ((d->resolveMask & QQuickIconPrivate::SourceResolved) && d->source == source)
         return;
 
+    d.detach();
     d->source = source;
     d->resolveMask |= QQuickIconPrivate::SourceResolved;
 }
 
 void QQuickIcon::resetSource()
 {
+    d.detach();
     d->source = QString();
     d->resolveMask &= ~QQuickIconPrivate::SourceResolved;
 }
@@ -152,12 +156,14 @@ void QQuickIcon::setWidth(int width)
     if ((d->resolveMask & QQuickIconPrivate::WidthResolved) && d->width == width)
         return;
 
+    d.detach();
     d->width = width;
     d->resolveMask |= QQuickIconPrivate::WidthResolved;
 }
 
 void QQuickIcon::resetWidth()
 {
+    d.detach();
     d->width = 0;
     d->resolveMask &= ~QQuickIconPrivate::WidthResolved;
 }
@@ -172,12 +178,14 @@ void QQuickIcon::setHeight(int height)
     if ((d->resolveMask & QQuickIconPrivate::HeightResolved) && d->height == height)
         return;
 
+    d.detach();
     d->height = height;
     d->resolveMask |= QQuickIconPrivate::HeightResolved;
 }
 
 void QQuickIcon::resetHeight()
 {
+    d.detach();
     d->height = 0;
     d->resolveMask &= ~QQuickIconPrivate::HeightResolved;
 }
@@ -192,12 +200,14 @@ void QQuickIcon::setColor(const QColor &color)
     if ((d->resolveMask & QQuickIconPrivate::ColorResolved) && d->color == color)
         return;
 
+    d.detach();
     d->color = color;
     d->resolveMask |= QQuickIconPrivate::ColorResolved;
 }
 
 void QQuickIcon::resetColor()
 {
+    d.detach();
     d->color = Qt::transparent;
     d->resolveMask &= ~QQuickIconPrivate::ColorResolved;
 }
@@ -212,12 +222,14 @@ void QQuickIcon::setCache(bool cache)
     if ((d->resolveMask & QQuickIconPrivate::CacheResolved) && d->cache == cache)
         return;
 
+    d.detach();
     d->cache = cache;
     d->resolveMask |= QQuickIconPrivate::CacheResolved;
 }
 
 void QQuickIcon::resetCache()
 {
+    d.detach();
     d->cache = true;
     d->resolveMask &= ~QQuickIconPrivate::CacheResolved;
 }
@@ -225,24 +237,25 @@ void QQuickIcon::resetCache()
 QQuickIcon QQuickIcon::resolve(const QQuickIcon &other) const
 {
     QQuickIcon resolved = *this;
+    resolved.d.detach();
 
     if (!(d->resolveMask & QQuickIconPrivate::NameResolved))
-        resolved.setName(other.name());
+        resolved.d->name = other.d->name;
 
     if (!(d->resolveMask & QQuickIconPrivate::SourceResolved))
-        resolved.setSource(other.source());
+        resolved.d->source = other.d->source;
 
     if (!(d->resolveMask & QQuickIconPrivate::WidthResolved))
-        resolved.setWidth(other.width());
+        resolved.d->width = other.d->width;
 
     if (!(d->resolveMask & QQuickIconPrivate::HeightResolved))
-        resolved.setHeight(other.height());
+        resolved.d->height = other.d->height;
 
     if (!(d->resolveMask & QQuickIconPrivate::ColorResolved))
-        resolved.setColor(other.color());
+        resolved.d->color = other.d->color;
 
     if (!(d->resolveMask & QQuickIconPrivate::CacheResolved))
-        resolved.setCache(other.cache());
+        resolved.d->cache = other.d->cache;
 
     return resolved;
 }