From 4a077f719dff799a89b5f370dfc71a7bd14b0930 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 14 Dec 2017 15:41:11 +0100 Subject: Page: use deferred execution Change-Id: Icb22f656893c89f61233bb547f03e63240bb8f97 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickpage.cpp | 4 ++++ src/quicktemplates2/qquickpage_p.h | 1 + 2 files changed, 5 insertions(+) (limited to 'src') 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 @@ -106,6 +106,8 @@ QQuickPagePrivate::QQuickPagePrivate() 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: -- cgit v1.2.3