Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Ifa88045268cdaa1adc0b1e206d5e20a3721d3837

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quicktemplates2/qquickicon.cpp b/src/quicktemplates2/qquickicon.cpp
index 5a689108..63ca96d5 100644
--- a/src/quicktemplates2/qquickicon.cpp
+++ b/src/quicktemplates2/qquickicon.cpp
@@ -227,19 +227,19 @@ QQuickIcon QQuickIcon::resolve(const QQuickIcon &other) const
     QQuickIcon resolved = *this;
 
     if (!(d->resolveMask & QQuickIconPrivate::NameResolved))
-        resolved.setName(other.name());
+        resolved.d->name = other.name();
 
     if (!(d->resolveMask & QQuickIconPrivate::SourceResolved))
-        resolved.setSource(other.source());
+        resolved.d->source = other.source();
 
     if (!(d->resolveMask & QQuickIconPrivate::WidthResolved))
-        resolved.setWidth(other.width());
+        resolved.d->width = other.width();
 
     if (!(d->resolveMask & QQuickIconPrivate::HeightResolved))
-        resolved.setHeight(other.height());
+        resolved.d->height = other.height();
 
     if (!(d->resolveMask & QQuickIconPrivate::ColorResolved))
-        resolved.setColor(other.color());
+        resolved.d->color = other.color();
 
     if (!(d->resolveMask & QQuickIconPrivate::CacheResolved))
         resolved.setCache(other.cache());