diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-12-14 20:00:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-12-15 10:04:26 +0000 |
| commit | 6b89293b99e763589181fd1f75470712f52cee3c (patch) | |
| tree | 028706ec2c8e28da6187c37539f6607887cf51a0 /src/quicktemplates2/qquickcontrol.cpp | |
| parent | a03f18e026bb564237702cab477589b6916a0102 (diff) | |
Control: defer the execution of the content item
Tumbler is excluded because test_customContentItemAtConstruction()
starts failing if deferred execution is enabled for the content item.
Task-number: QTBUG-50992
Change-Id: I11022c3c380311396453cf6229e068e4aae2d82a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickcontrol.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 26f1f7e8..cfecc67c 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -281,6 +281,8 @@ void QQuickControlPrivate::resizeContent() QQuickItem *QQuickControlPrivate::getContentItem() { + if (!contentItem) + executeContentItem(); return contentItem; } @@ -1321,6 +1323,7 @@ void QQuickControl::componentComplete() { Q_D(QQuickControl); d->executeBackground(true); + d->executeContentItem(true); QQuickItem::componentComplete(); d->resizeContent(); if (!d->hasLocale) |