aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-05-31 11:02:40 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-05-31 12:14:45 +0000
commit830ab8aa4fa805c011eb082dfd2075ab4f03f919 (patch)
treed28e9588b8551ebe9bf17480a2cde830db3672bf /src
parent1f26b91740807f6a8c9d480bcb0d63ea2e0c10d6 (diff)
Page: fix initial layouting of dynamically created instances
Task-number: QTBUG-61109 Change-Id: I43d28a80ec1a46e836fa8a0f76ee65b0c1a24228 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/quicktemplates2/qquickpage.cpp7
-rw-r--r--src/quicktemplates2/qquickpage_p.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp
index 6137a7e8..40d47cda 100644
--- a/src/quicktemplates2/qquickpage.cpp
+++ b/src/quicktemplates2/qquickpage.cpp
@@ -329,6 +329,13 @@ QQmlListProperty<QQuickItem> QQuickPage::contentChildren()
QQuickItemPrivate::children_clear);
}
+void QQuickPage::componentComplete()
+{
+ Q_D(QQuickPage);
+ QQuickControl::componentComplete();
+ d->layout->update();
+}
+
void QQuickPage::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
{
QQuickControl::contentItemChange(newItem, oldItem);
diff --git a/src/quicktemplates2/qquickpage_p.h b/src/quicktemplates2/qquickpage_p.h
index 90d10e4a..1b14588a 100644
--- a/src/quicktemplates2/qquickpage_p.h
+++ b/src/quicktemplates2/qquickpage_p.h
@@ -97,6 +97,8 @@ Q_SIGNALS:
void contentChildrenChanged();
protected:
+ void componentComplete() override;
+
void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override;