1 files changed, 26 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index d579afb2..94b0de98 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -43,6 +43,8 @@
 #include "qquicktoolbar_p.h"
 #include "qquicktabbar_p.h"
 #include "qquickdialogbuttonbox_p.h"
+#include "qquickdeferredexecute_p_p.h"
+#include "qquickdeferredpointer_p_p.h"
 
 #include <QtCore/private/qobject_p.h>
 #include <QtQuick/private/qquickitem_p.h>
@@ -164,8 +166,10 @@ public:
 
     static void contentData_append(QQmlListProperty<QObject> *prop, QObject *obj);
 
+    void executeBackground(bool complete = false);
+
     bool complete;
-    QQuickItem *background;
+    QQuickDeferredPointer<QQuickItem> background;
     QQuickItem *contentItem;
     QQuickItem *menuBar;
     QQuickItem *header;
@@ -328,6 +332,20 @@ void QQuickApplicationWindowPrivate::contentData_append(QQmlListProperty<QObject
         QQuickPopupPrivate::get(popup)->setWindow(static_cast<QQuickApplicationWindow *>(prop->data));
 }
 
+static inline QString backgroundName() { return QStringLiteral("background"); }
+
+void QQuickApplicationWindowPrivate::executeBackground(bool complete)
+{
+    Q_Q(QQuickApplicationWindow);
+    if (background.wasExecuted())
+        return;
+
+    if (!background)
+        quickBeginDeferred(q, backgroundName(), background);
+    if (complete)
+        quickCompleteDeferred(q, backgroundName(), background);
+}
+
 QQuickApplicationWindow::QQuickApplicationWindow(QWindow *parent)
     : QQuickWindowQmlImpl(parent), d_ptr(new QQuickApplicationWindowPrivate)
 {
@@ -374,7 +392,9 @@ QQuickApplicationWindowAttached *QQuickApplicationWindow::qmlAttachedProperties(
 */
 QQuickItem *QQuickApplicationWindow::background() const
 {
-    Q_D(const QQuickApplicationWindow);
+    QQuickApplicationWindowPrivate *d = const_cast<QQuickApplicationWindowPrivate *>(d_func());
+    if (!d->background)
+        d->executeBackground();
     return d->background;
 }
 
@@ -384,7 +404,7 @@ void QQuickApplicationWindow::setBackground(QQuickItem *background)
     if (d->background == background)
         return;
 
-    QQuickControlPrivate::destroyDelegate(d->background, this);
+    delete d->background;
     d->background = background;
     if (background) {
         background->setParentItem(QQuickWindow::contentItem());
@@ -393,7 +413,8 @@ void QQuickApplicationWindow::setBackground(QQuickItem *background)
         if (isComponentComplete())
             d->relayout();
     }
-    emit backgroundChanged();
+    if (!d->background.isExecuting())
+        emit backgroundChanged();
 }
 
 /*!
@@ -812,6 +833,7 @@ void QQuickApplicationWindow::componentComplete()
 {
     Q_D(QQuickApplicationWindow);
     d->complete = true;
+    d->executeBackground(true);
     QQuickWindowQmlImpl::componentComplete();
     d->relayout();
 }