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>

1 files changed, 3 insertions, 12 deletions

diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp
index b1175302..4c3e1422 100644
--- a/src/quicktemplates2/qquickpane.cpp
+++ b/src/quicktemplates2/qquickpane.cpp
@@ -113,11 +113,9 @@ QQuickPanePrivate::QQuickPanePrivate()
 QQuickItem *QQuickPanePrivate::getContentItem()
 {
     Q_Q(QQuickPane);
-    if (!contentItem)
-        executeContentItem();
-    if (!contentItem)
-        return new QQuickItem(q);
-    return contentItem;
+    if (QQuickItem *item = QQuickControlPrivate::getContentItem())
+        return item;
+    return new QQuickItem(q);
 }
 
 QQuickPane::QQuickPane(QQuickItem *parent)
@@ -237,13 +235,6 @@ QQmlListProperty<QQuickItem> QQuickPane::contentChildren()
                                         QQuickItemPrivate::children_clear);
 }
 
-void QQuickPane::componentComplete()
-{
-    Q_D(QQuickPane);
-    d->executeContentItem(true);
-    QQuickControl::componentComplete();
-}
-
 void QQuickPane::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
 {
     QQuickControl::contentItemChange(newItem, oldItem);