1 files changed, 24 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h
index f612434b..bcd1aca6 100644
--- a/src/quicktemplates2/qquicklabel_p_p.h
+++ b/src/quicktemplates2/qquicklabel_p_p.h
@@ -48,6 +48,7 @@
 // We mean it.
 //
 
+#include <QtQml/private/qlazilyallocated_p.h>
 #include <QtQuick/private/qquicktext_p_p.h>
 #include <QtQuickTemplates2/private/qquickdeferredpointer_p_p.h>
 
@@ -57,8 +58,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAccessibleAttached;
-
 class QQuickLabelPrivate : public QQuickTextPrivate
 #if QT_CONFIG(accessibility)
     , public QAccessible::ActivationObserver
@@ -76,7 +75,22 @@ public:
     }
 
     void resolveFont();
-    void inheritFont(const QFont &f);
+    void inheritFont(const QFont &font);
+    void updateFont(const QFont &font);
+    inline void setFont_helper(const QFont &font) {
+        if (sourceFont.resolve() == font.resolve() && sourceFont == font)
+            return;
+        updateFont(font);
+    }
+
+    void resolvePalette();
+    void inheritPalette(const QPalette &palette);
+    void updatePalette(const QPalette &palette);
+    inline void setPalette_helper(const QPalette &palette) {
+        if (resolvedPalette.resolve() == palette.resolve() && resolvedPalette == palette)
+            return;
+        updatePalette(palette);
+    }
 
     void textChanged(const QString &text);
 
@@ -88,9 +102,14 @@ public:
     void cancelBackground();
     void executeBackground(bool complete = false);
 
-    QFont font;
+    struct ExtraData {
+        QFont requestedFont;
+        QPalette requestedPalette;
+    };
+    QLazilyAllocated<ExtraData> extra;
+
+    QPalette resolvedPalette;
     QQuickDeferredPointer<QQuickItem> background;
-    QQuickAccessibleAttached *accessibleAttached;
 };
 
 QT_END_NAMESPACE