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

Change-Id: I83cbec9264a8bc620badf210eee53b57f2b93ff0

2 files changed, 16 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 5feb9640..f6101973 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -1729,8 +1729,12 @@ void QQuickPopup::componentComplete()
 {
     Q_D(QQuickPopup);
     d->complete = true;
-    if (!parentItem())
-        setParentItem(qobject_cast<QQuickItem *>(parent()));
+    if (!parentItem()) {
+        if (QQuickItem *item = qobject_cast<QQuickItem *>(parent()))
+            setParentItem(item);
+        else if (QQuickWindow *window = qobject_cast<QQuickWindow *>(parent()))
+            setParentItem(window->contentItem());
+    }
     if (d->visible)
         d->transitionManager.transitionEnter();
     d->popupItem->componentComplete();
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index 6294250e..3d88e62a 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -1230,4 +1230,14 @@ TestCase {
         compare(control.x, (control.parent.width - control.width) / 2)
         compare(control.y, (control.parent.height - control.height) / 2)
     }
+
+    function test_windowParent() {
+        var control = popupControl.createObject(applicationWindow, {width: 100, height: 100})
+        verify(control)
+
+        control.open()
+        verify(control.visible)
+
+        control.destroy()
+    }
 }