summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2019-09-09 16:10:37 +0300
committerLiang Qi <liang.qi@qt.io>2019-09-10 10:19:43 +0000
commit0bcd8ed5c38a451e7458b820a25449c9cb408704 (patch)
tree599f65e4293d91c1c29258ce76a0252aeaaf7ae2
parent933787fb59cbc76301841ae77e51c8bc081e35f3 (diff)
QQuickIcon: properly resolve implicit values - take 2
This is a follow up of 382531ab5e2270833d3805c57c00ebcf6b24d635, and amends 1241c80eca725c9ac46a0b94d6bdec11a5d00302 . when the property has not been set explicitly, the resolved mask must not contain a respective bit set either Change-Id: I45a334b51fce09ead8e30fe3326a94f35b0f4f56 Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--src/quicktemplates2/qquickicon.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquickicon.cpp b/src/quicktemplates2/qquickicon.cpp
index 63ca96d5..61803e30 100644
--- a/src/quicktemplates2/qquickicon.cpp
+++ b/src/quicktemplates2/qquickicon.cpp
@@ -227,22 +227,22 @@ QQuickIcon QQuickIcon::resolve(const QQuickIcon &other) const
QQuickIcon resolved = *this;
if (!(d->resolveMask & QQuickIconPrivate::NameResolved))
- resolved.d->name = other.name();
+ resolved.d->name = other.d->name;
if (!(d->resolveMask & QQuickIconPrivate::SourceResolved))
- resolved.d->source = other.source();
+ resolved.d->source = other.d->source;
if (!(d->resolveMask & QQuickIconPrivate::WidthResolved))
- resolved.d->width = other.width();
+ resolved.d->width = other.d->width;
if (!(d->resolveMask & QQuickIconPrivate::HeightResolved))
- resolved.d->height = other.height();
+ resolved.d->height = other.d->height;
if (!(d->resolveMask & QQuickIconPrivate::ColorResolved))
- resolved.d->color = 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;
}