Control: defer the execution of the background item

Task-number: QTBUG-50992
Change-Id: I6372e143c68f0a5bf7212d759281acef3c81618e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

11 files changed, 2 insertions, 9 deletions

diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 48d5fceb..7448ac9a 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -605,7 +605,6 @@ void QQuickAbstractButton::componentComplete()
 {
     Q_D(QQuickAbstractButton);
     d->executeIndicator(true);
-    d->executeBackground(true);
     d->executeContentItem(true);
     QQuickControl::componentComplete();
 }
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index dde27e2a..357800d6 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -1591,7 +1591,6 @@ void QQuickComboBox::componentComplete()
 {
     Q_D(QQuickComboBox);
     d->executeIndicator(true);
-    d->executeBackground(true);
     d->executeContentItem(true);
     if (d->popup)
         d->executePopup(true);
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 2f3791d5..26f1f7e8 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -1320,6 +1320,7 @@ void QQuickControl::classBegin()
 void QQuickControl::componentComplete()
 {
     Q_D(QQuickControl);
+    d->executeBackground(true);
     QQuickItem::componentComplete();
     d->resizeContent();
     if (!d->hasLocale)
diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h
index 8b52bd02..4cc4a205 100644
--- a/src/quicktemplates2/qquickcontrol_p.h
+++ b/src/quicktemplates2/qquickcontrol_p.h
@@ -78,6 +78,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControl : public QQuickItem
     Q_PROPERTY(bool wheelEnabled READ isWheelEnabled WRITE setWheelEnabled NOTIFY wheelEnabledChanged FINAL)
     Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
     Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL)
+    Q_CLASSINFO("DeferredPropertyNames", "background")
 
 public:
     explicit QQuickControl(QQuickItem *parent = nullptr);
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 46085c47..964cefe1 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -751,7 +751,6 @@ void QQuickDial::componentComplete()
 {
     Q_D(QQuickDial);
     d->executeHandle(true);
-    d->executeBackground(true);
     QQuickControl::componentComplete();
     setValue(d->value);
     d->updatePosition();
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp
index f679d90a..98ce75e9 100644
--- a/src/quicktemplates2/qquickpage.cpp
+++ b/src/quicktemplates2/qquickpage.cpp
@@ -332,7 +332,6 @@ 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/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp
index 2425b865..b1175302 100644
--- a/src/quicktemplates2/qquickpane.cpp
+++ b/src/quicktemplates2/qquickpane.cpp
@@ -240,7 +240,6 @@ QQmlListProperty<QQuickItem> QQuickPane::contentChildren()
 void QQuickPane::componentComplete()
 {
     Q_D(QQuickPane);
-    d->executeBackground(true);
     d->executeContentItem(true);
     QQuickControl::componentComplete();
 }
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index 44c00f68..51b646ce 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -1084,7 +1084,6 @@ void QQuickRangeSlider::componentComplete()
     QQuickRangeSliderNodePrivate *secondPrivate = QQuickRangeSliderNodePrivate::get(d->second);
     firstPrivate->executeHandle(true);
     secondPrivate->executeHandle(true);
-    d->executeBackground(true);
 
     QQuickControl::componentComplete();
 
diff --git a/src/quicktemplates2/qquickrangeslider_p.h b/src/quicktemplates2/qquickrangeslider_p.h
index cc071974..b8182768 100644
--- a/src/quicktemplates2/qquickrangeslider_p.h
+++ b/src/quicktemplates2/qquickrangeslider_p.h
@@ -67,7 +67,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRangeSlider : public QQuickControl
     Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL)
     // 2.2 (Qt 5.9)
     Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2)
-    Q_CLASSINFO("DeferredPropertyNames", "background")
 
 public:
     explicit QQuickRangeSlider(QQuickItem *parent = nullptr);
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index d4cbf61c..73fa2725 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -725,7 +725,6 @@ void QQuickSlider::componentComplete()
 {
     Q_D(QQuickSlider);
     d->executeHandle(true);
-    d->executeBackground(true);
     QQuickControl::componentComplete();
     setValue(d->value);
     d->updatePosition();
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index d390f570..1f821ac6 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -884,7 +884,6 @@ void QQuickSpinBox::componentComplete()
     Q_D(QQuickSpinBox);
     QQuickSpinButtonPrivate::get(d->up)->executeIndicator(true);
     QQuickSpinButtonPrivate::get(d->down)->executeIndicator(true);
-    d->executeBackground(true);
     d->executeContentItem(true);
 
     QQuickControl::componentComplete();