1 files changed, 15 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquicktextarea_p_p.h b/src/quicktemplates2/qquicktextarea_p_p.h
index 1115b3e9..22ad4b09 100644
--- a/src/quicktemplates2/qquicktextarea_p_p.h
+++ b/src/quicktemplates2/qquicktextarea_p_p.h
@@ -48,6 +48,7 @@
 // We mean it.
 //
 
+#include <QtQml/private/qlazilyallocated_p.h>
 #include <QtQuick/private/qquicktextedit_p_p.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
 #include <QtQuickTemplates2/private/qquickpresshandler_p_p.h>
@@ -80,8 +81,15 @@ public:
     }
 
     void resizeBackground();
+
     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);
+    }
 
 #if QT_CONFIG(quicktemplates2_hover)
     void updateHoverEnabled(bool h, bool e);
@@ -112,7 +120,12 @@ public:
     bool hovered;
     bool explicitHoverEnabled;
 #endif
-    QFont font;
+
+    struct ExtraData {
+        QFont requestedFont;
+    };
+    QLazilyAllocated<ExtraData> extra;
+
     QQuickItem *background;
     QString placeholder;
     Qt::FocusReason focusReason;