Control: resolve the font a bit earlier

Also applied to QQuickLabel, QQuickTextArea and QQuickTextField.

Change-Id: Icf10500905980445809eb2375e8957db2c41e03c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp
index dd8ef362..50d49c11 100644
--- a/src/templates/qquicktextfield.cpp
+++ b/src/templates/qquicktextfield.cpp
@@ -309,6 +309,21 @@ void QQuickTextField::setPlaceholderText(const QString &text)
     }
 }
 
+void QQuickTextField::classBegin()
+{
+    Q_D(QQuickTextField);
+    QQuickTextInput::classBegin();
+    d->resolveFont();
+}
+
+void QQuickTextField::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
+{
+    Q_D(QQuickTextField);
+    QQuickTextInput::itemChange(change, value);
+    if (change == ItemParentHasChanged && isComponentComplete())
+        d->resolveFont();
+}
+
 void QQuickTextField::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickTextField);