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/qquickpage.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/qquickpage.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpage.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index 98ce75e9..907b01e9 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -106,11 +106,9 @@ QQuickPagePrivate::QQuickPagePrivate() QQuickItem *QQuickPagePrivate::getContentItem() { Q_Q(QQuickPage); - if (!contentItem) - executeContentItem(); - if (!contentItem) - return new QQuickItem(q); - return contentItem; + if (QQuickItem *item = QQuickControlPrivate::getContentItem()) + return item; + return new QQuickItem(q); } QQuickPage::QQuickPage(QQuickItem *parent) @@ -332,7 +330,6 @@ void QQuickPage::setContentHeight(qreal height) void QQuickPage::componentComplete() { Q_D(QQuickPage); - d->executeContentItem(true); QQuickControl::componentComplete(); d->layout->update(); } |