Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ieb9bcfba9651d646509afd065ce2389ef74448cc

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index 19f6f82b..903de676 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype ApplicationWindow
     \inherits Window
-    \instantiates QQuickApplicationWindow
+//!     \instantiates QQuickApplicationWindow
     \inqmlmodule QtQuick.Controls
     \since 5.7
     \ingroup qtquickcontrols2-containers
@@ -407,7 +407,7 @@ void QQuickApplicationWindow::setBackground(QQuickItem *background)
     if (!d->background.isExecuting())
         d->cancelBackground();
 
-    delete d->background;
+    QQuickControlPrivate::hideOldItem(d->background);
     d->background = background;
     if (background) {
         background->setParentItem(QQuickWindow::contentItem());