1 files changed, 15 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquicktextfield_p_p.h b/src/quicktemplates2/qquicktextfield_p_p.h
index e8dc625b..6f36dda4 100644
--- a/src/quicktemplates2/qquicktextfield_p_p.h
+++ b/src/quicktemplates2/qquicktextfield_p_p.h
@@ -48,6 +48,7 @@
 // We mean it.
 //
 
+#include <QtQml/private/qlazilyallocated_p.h>
 #include <QtQuick/private/qquicktextinput_p_p.h>
 #include <QtQuickTemplates2/private/qquickpresshandler_p_p.h>
 
@@ -76,8 +77,15 @@ public:
         return static_cast<QQuickTextFieldPrivate *>(QObjectPrivate::get(item)); }
 
     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);
@@ -101,7 +109,12 @@ public:
     bool hovered;
     bool explicitHoverEnabled;
 #endif
-    QFont font;
+
+    struct ExtraData {
+        QFont requestedFont;
+    };
+    QLazilyAllocated<ExtraData> extra;
+
     QQuickItem *background;
     QString placeholder;
     Qt::FocusReason focusReason;