diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-12-14 15:41:11 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-12-14 18:07:13 +0000 |
| commit | 4a077f719dff799a89b5f370dfc71a7bd14b0930 (patch) | |
| tree | 823a144ca0ae2617b3a95ef1325b7b17b1ad442c | |
| parent | a31f0a1e7e187944eb8744c84c085f2e76752eb5 (diff) | |
Page: use deferred execution
Change-Id: Icb22f656893c89f61233bb547f03e63240bb8f97
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/quicktemplates2/qquickpage.cpp | 4 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickpage_p.h | 1 | ||||
| -rw-r--r-- | tests/auto/customization/tst_customization.cpp | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index 50050df3..f679d90a 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -107,6 +107,8 @@ QQuickItem *QQuickPagePrivate::getContentItem() { Q_Q(QQuickPage); if (!contentItem) + executeContentItem(); + if (!contentItem) return new QQuickItem(q); return contentItem; } @@ -330,6 +332,8 @@ void QQuickPage::setContentHeight(qreal height) void QQuickPage::componentComplete() { Q_D(QQuickPage); + d->executeBackground(true); + d->executeContentItem(true); QQuickControl::componentComplete(); d->layout->update(); } diff --git a/src/quicktemplates2/qquickpage_p.h b/src/quicktemplates2/qquickpage_p.h index 0789e996..a2161ab5 100644 --- a/src/quicktemplates2/qquickpage_p.h +++ b/src/quicktemplates2/qquickpage_p.h @@ -66,6 +66,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPage : public QQuickControl // 2.1 (Qt 5.8) Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL REVISION 1) Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL REVISION 1) + Q_CLASSINFO("DeferredPropertyNames", "background,contentItem") Q_CLASSINFO("DefaultProperty", "contentData") public: diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/customization/tst_customization.cpp index b10fa71a..163c6855 100644 --- a/tests/auto/customization/tst_customization.cpp +++ b/tests/auto/customization/tst_customization.cpp @@ -355,7 +355,6 @@ void tst_customization::creation() QEXPECT_FAIL("override:Control", "TODO", Abort); QEXPECT_FAIL("override:DialogButtonBox", "TODO", Abort); QEXPECT_FAIL("override:MenuSeparator", "TODO", Abort); - QEXPECT_FAIL("override:Page", "TODO", Abort); QEXPECT_FAIL("override:PageIndicator", "TODO", Abort); QEXPECT_FAIL("override:ProgressBar", "TODO", Abort); QEXPECT_FAIL("override:ScrollBar", "TODO", Abort); |