Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: If097242bfffe435d3b379a73eb6c8f54bed8495b

1 files changed, 4 insertions, 7 deletions

diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index af14ba6f..7f466fd7 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -158,12 +158,6 @@ void QQuickApplicationWindowPrivate::relayout()
     content->setWidth(q->width());
     content->setHeight(q->height() - hh - fh);
 
-    if (overlay) {
-        overlay->setWidth(q->width());
-        overlay->setHeight(q->height());
-        overlay->stackAfter(content);
-    }
-
     if (header) {
         header->setY(-hh);
         QQuickItemPrivate *p = QQuickItemPrivate::get(header);
@@ -489,9 +483,12 @@ QQuickItem *QQuickApplicationWindow::activeFocusControl() const
 QQuickOverlay *QQuickApplicationWindow::overlay() const
 {
     QQuickApplicationWindowPrivate *d = const_cast<QQuickApplicationWindowPrivate *>(d_func());
+    if (!d) // being deleted
+        return nullptr;
+
     if (!d->overlay) {
         d->overlay = new QQuickOverlay(QQuickWindow::contentItem());
-        d->relayout();
+        d->overlay->stackAfter(QQuickApplicationWindow::contentItem());
     }
     return d->overlay;
 }