QQuickIcon: properly resolve implicit values

when the property has not been set explicitly,
the resolved mask must not contain a respective bit set either

Change-Id: Iab0bd600b5bf458e26ed4601d4d2f608021f1518
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quicktemplates2/qquickicon.cpp b/src/quicktemplates2/qquickicon.cpp
index 1b8f4797..bfa2f8c1 100644
--- a/src/quicktemplates2/qquickicon.cpp
+++ b/src/quicktemplates2/qquickicon.cpp
@@ -204,19 +204,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();
 
     return resolved;
 }