2 files changed, 32 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickicon.cpp b/src/quicktemplates2/qquickicon.cpp
index 1b8f4797..5a689108 100644
--- a/src/quicktemplates2/qquickicon.cpp
+++ b/src/quicktemplates2/qquickicon.cpp
@@ -46,6 +46,7 @@ public:
     int width = 0;
     int height = 0;
     QColor color = Qt::transparent;
+    bool cache = true;
 
     enum ResolveProperties {
         NameResolved = 0x0001,
@@ -53,6 +54,7 @@ public:
         WidthResolved = 0x0004,
         HeightResolved = 0x0008,
         ColorResolved = 0x0010,
+        CacheResolved = 0x0020,
         AllPropertiesResolved = 0x1ffff
     };
 
@@ -86,7 +88,8 @@ bool QQuickIcon::operator==(const QQuickIcon &other) const
                             && d->source == other.d->source
                             && d->width == other.d->width
                             && d->height == other.d->height
-                            && d->color == other.d->color);
+                            && d->color == other.d->color
+                            && d->cache == other.d->cache);
 }
 
 bool QQuickIcon::operator!=(const QQuickIcon &other) const
@@ -199,6 +202,26 @@ void QQuickIcon::resetColor()
     d->resolveMask &= ~QQuickIconPrivate::ColorResolved;
 }
 
+bool QQuickIcon::cache() const
+{
+    return d->cache;
+}
+
+void QQuickIcon::setCache(bool cache)
+{
+    if ((d->resolveMask & QQuickIconPrivate::CacheResolved) && d->cache == cache)
+        return;
+
+    d->cache = cache;
+    d->resolveMask |= QQuickIconPrivate::CacheResolved;
+}
+
+void QQuickIcon::resetCache()
+{
+    d->cache = true;
+    d->resolveMask &= ~QQuickIconPrivate::CacheResolved;
+}
+
 QQuickIcon QQuickIcon::resolve(const QQuickIcon &other) const
 {
     QQuickIcon resolved = *this;
@@ -218,6 +241,9 @@ QQuickIcon QQuickIcon::resolve(const QQuickIcon &other) const
     if (!(d->resolveMask & QQuickIconPrivate::ColorResolved))
         resolved.setColor(other.color());
 
+    if (!(d->resolveMask & QQuickIconPrivate::CacheResolved))
+        resolved.setCache(other.cache());
+
     return resolved;
 }
 
diff --git a/src/quicktemplates2/qquickicon_p.h b/src/quicktemplates2/qquickicon_p.h
index 2c95bc9d..57cab720 100644
--- a/src/quicktemplates2/qquickicon_p.h
+++ b/src/quicktemplates2/qquickicon_p.h
@@ -67,6 +67,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickIcon
     Q_PROPERTY(int width READ width WRITE setWidth RESET resetWidth FINAL)
     Q_PROPERTY(int height READ height WRITE setHeight RESET resetHeight FINAL)
     Q_PROPERTY(QColor color READ color WRITE setColor RESET resetColor FINAL)
+    Q_PROPERTY(bool cache READ cache WRITE setCache RESET resetCache FINAL)
 
 public:
     QQuickIcon();
@@ -99,6 +100,10 @@ public:
     void setColor(const QColor &color);
     void resetColor();
 
+    bool cache() const;
+    void setCache(bool cache);
+    void resetCache();
+
     QQuickIcon resolve(const QQuickIcon &other) const;
 
 private: