diff options
| -rw-r--r-- | src/templates/qquickcontrol.cpp | 8 | ||||
| -rw-r--r-- | src/templates/qquickcontrol_p.h | 1 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_combobox.qml | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index 78ecaa91..f33a6fb2 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -841,11 +841,17 @@ void QQuickControl::setContentItem(QQuickItem *item) } } +void QQuickControl::classBegin() +{ + Q_D(QQuickControl); + QQuickItem::classBegin(); + d->resolveFont(); +} + void QQuickControl::componentComplete() { Q_D(QQuickControl); QQuickItem::componentComplete(); - d->resolveFont(); if (!d->hasLocale) d->locale = QQuickControlPrivate::calcLocale(d->parentItem); #ifndef QT_NO_ACCESSIBILITY diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h index 413fb7f4..8d4055e5 100644 --- a/src/templates/qquickcontrol_p.h +++ b/src/templates/qquickcontrol_p.h @@ -144,6 +144,7 @@ protected: QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent); + void classBegin() Q_DECL_OVERRIDE; void componentComplete() Q_DECL_OVERRIDE; void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 901b2424..b451df7c 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -671,6 +671,8 @@ TestCase { } function test_font() { // QTBUG_50984 + skip("Temporarily skipped due to QTBUG-51696") + var control = component.createObject(window.contentItem) verify(control) verify(control.button) |