diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-16 12:50:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-18 12:53:26 +0000 |
| commit | 3cba8b19c4e67cbcd6977bf141d7ddf2e54aae85 (patch) | |
| tree | 68837d280856524d53b36ad38bf4b1c27bf41b12 /src/templates | |
| parent | adf7743ccf2ec9e7604187e699b4d0388efef2b7 (diff) | |
QQuickControl: delayed the call of resolveFont()
Change-Id: Iadfbc3a39de102825c9dde60a236883b88834b34
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/qquickcontrol.cpp | 8 | ||||
| -rw-r--r-- | src/templates/qquickcontrol_p.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index f8978398..d4c54806 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -352,13 +352,6 @@ QQuickControl::QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent) : { } -void QQuickControl::classBegin() -{ - Q_D(QQuickControl); - QQuickItem::classBegin(); - d->resolveFont(); -} - void QQuickControl::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value) { Q_D(QQuickControl); @@ -816,6 +809,7 @@ void QQuickControl::componentComplete() { Q_D(QQuickControl); QQuickItem::componentComplete(); + d->resolveFont(); #ifndef QT_NO_ACCESSIBILITY if (!d->accessibleAttached && QAccessible::isActive()) accessibilityActiveChanged(true); diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h index 8d4055e5..413fb7f4 100644 --- a/src/templates/qquickcontrol_p.h +++ b/src/templates/qquickcontrol_p.h @@ -144,7 +144,6 @@ 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; |