ApplicationWindow: remove deprecated overlay API

[ChangeLog][Controls][ApplicationWindow] The deprecated overlay
properties and attached API were removed. Use the Overlay attached type
instead.

Task-number: QTBUG-84715
Change-Id: I0781ea55ea502ffe5277385e82492291724d2090
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

5 files changed, 37 insertions, 62 deletions

diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index 71d6f2d7..0c6ab78a 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -1062,8 +1062,8 @@ TestCase {
 
     function findOverlay(window, popup) {
         var item = popup.contentItem.parent
-        var idx = indexOf(window.overlay.children, item)
-        return window.overlay.children[idx - 1]
+        var idx = indexOf(window.Overlay.overlay.children, item)
+        return window.Overlay.overlay.children[idx - 1]
     }
 
     function test_overlay() {
@@ -1073,42 +1073,41 @@ TestCase {
         window.requestActivate()
         tryCompare(window, "active", true)
 
-        compare(window.overlay.children.length, 0)
-        compare(window.overlay, window.Overlay.overlay)
+        compare(window.Overlay.overlay.children.length, 0)
 
         var firstOverlay = findOverlay(window, window.firstDrawer)
         verify(!firstOverlay)
         window.firstDrawer.open()
-        compare(window.overlay.children.length, 2) // 1 drawer + 1 overlay
+        compare(window.Overlay.overlay.children.length, 2) // 1 drawer + 1 overlay
         firstOverlay = findOverlay(window, window.firstDrawer)
         verify(firstOverlay)
         compare(firstOverlay.z, window.firstDrawer.z)
-        compare(indexOf(window.overlay.children, firstOverlay),
-                indexOf(window.overlay.children, window.firstDrawer.contentItem.parent) - 1)
+        compare(indexOf(window.Overlay.overlay.children, firstOverlay),
+                indexOf(window.Overlay.overlay.children, window.firstDrawer.contentItem.parent) - 1)
         tryCompare(firstOverlay, "opacity", 1.0)
 
         var secondOverlay = findOverlay(window, window.secondDrawer)
         verify(!secondOverlay)
         window.secondDrawer.open()
-        compare(window.overlay.children.length, 4) // 2 drawers + 2 overlays
+        compare(window.Overlay.overlay.children.length, 4) // 2 drawers + 2 overlays
         secondOverlay = findOverlay(window, window.secondDrawer)
         verify(secondOverlay)
         compare(secondOverlay.z, window.secondDrawer.z)
-        compare(indexOf(window.overlay.children, secondOverlay),
-                indexOf(window.overlay.children, window.secondDrawer.contentItem.parent) - 1)
+        compare(indexOf(window.Overlay.overlay.children, secondOverlay),
+                indexOf(window.Overlay.overlay.children, window.secondDrawer.contentItem.parent) - 1)
         tryCompare(secondOverlay, "opacity", 1.0)
 
         window.firstDrawer.close()
         tryCompare(window.firstDrawer, "visible", false)
         firstOverlay = findOverlay(window, window.firstDrawer)
         verify(!firstOverlay)
-        compare(window.overlay.children.length, 2) // 1 drawer + 1 overlay
+        compare(window.Overlay.overlay.children.length, 2) // 1 drawer + 1 overlay
 
         window.secondDrawer.close()
         tryCompare(window.secondDrawer, "visible", false)
         secondOverlay = findOverlay(window, window.secondDrawer)
         verify(!secondOverlay)
-        compare(window.overlay.children.length, 0)
+        compare(window.Overlay.overlay.children.length, 0)
 
         var modalOverlay = findOverlay(window, window.modalPopup)
         verify(!modalOverlay)
@@ -1118,7 +1117,7 @@ TestCase {
         compare(modalOverlay.z, window.modalPopup.z)
         compare(window.modalPopup.visible, true)
         tryCompare(modalOverlay, "opacity", 1.0)
-        compare(window.overlay.children.length, 2) // 1 popup + 1 overlay
+        compare(window.Overlay.overlay.children.length, 2) // 1 popup + 1 overlay
 
         var modelessOverlay = findOverlay(window, window.modelessPopup)
         verify(!modelessOverlay)
@@ -1128,13 +1127,13 @@ TestCase {
         compare(modelessOverlay.z, window.modelessPopup.z)
         compare(window.modelessPopup.visible, true)
         tryCompare(modelessOverlay, "opacity", 1.0)
-        compare(window.overlay.children.length, 4) // 2 popups + 2 overlays
+        compare(window.Overlay.overlay.children.length, 4) // 2 popups + 2 overlays
 
         window.modelessPopup.close()
         tryCompare(window.modelessPopup, "visible", false)
         modelessOverlay = findOverlay(window, window.modelessPopup)
         verify(!modelessOverlay)
-        compare(window.overlay.children.length, 2) // 1 popup + 1 overlay
+        compare(window.Overlay.overlay.children.length, 2) // 1 popup + 1 overlay
 
         compare(window.modalPopup.visible, true)
         compare(modalOverlay.opacity, 1.0)
@@ -1143,29 +1142,29 @@ TestCase {
         tryCompare(window.modalPopup, "visible", false)
         modalOverlay = findOverlay(window, window.modalPopup)
         verify(!modalOverlay)
-        compare(window.overlay.children.length, 0)
+        compare(window.Overlay.overlay.children.length, 0)
 
         window.plainPopup.open()
         tryCompare(window.plainPopup, "visible", true)
-        compare(window.overlay.children.length, 1) // only popup added, no overlays involved
+        compare(window.Overlay.overlay.children.length, 1) // only popup added, no overlays involved
 
         window.plainPopup.modal = true
-        compare(window.overlay.children.length, 2) // overlay added
+        compare(window.Overlay.overlay.children.length, 2) // overlay added
 
         window.plainPopup.close()
         tryCompare(window.plainPopup, "visible", false)
-        compare(window.overlay.children.length, 0) // popup + overlay removed
+        compare(window.Overlay.overlay.children.length, 0) // popup + overlay removed
 
         window.modalPopupWithoutDim.open()
         tryCompare(window.modalPopupWithoutDim, "visible", true)
-        compare(window.overlay.children.length, 1) // only popup added, no overlays involved
+        compare(window.Overlay.overlay.children.length, 1) // only popup added, no overlays involved
 
         window.modalPopupWithoutDim.dim = true
-        compare(window.overlay.children.length, 2) // overlay added
+        compare(window.Overlay.overlay.children.length, 2) // overlay added
 
         window.modalPopupWithoutDim.close()
         tryCompare(window.modalPopupWithoutDim, "visible", false)
-        compare(window.overlay.children.length, 0) // popup + overlay removed
+        compare(window.Overlay.overlay.children.length, 0) // popup + overlay removed
     }
 
     function test_attached_applicationwindow() {
diff --git a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
index 53a139c1..fdb349ce 100644
--- a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
+++ b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
@@ -65,7 +65,6 @@ ApplicationWindow {
         property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
         property Item attached_header: ApplicationWindow.header
         property Item attached_footer: ApplicationWindow.footer
-        property Item attached_overlay: ApplicationWindow.overlay
     }
 
     Item {
@@ -76,7 +75,6 @@ ApplicationWindow {
         property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
         property Item attached_header: ApplicationWindow.header
         property Item attached_footer: ApplicationWindow.footer
-        property Item attached_overlay: ApplicationWindow.overlay
     }
 
     QtObject {
@@ -87,7 +85,6 @@ ApplicationWindow {
         property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
         property Item attached_header: ApplicationWindow.header
         property Item attached_footer: ApplicationWindow.footer
-        property Item attached_overlay: ApplicationWindow.overlay
     }
 
     property alias childWindow: childWindow
@@ -103,7 +100,6 @@ ApplicationWindow {
         property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
         property Item attached_header: ApplicationWindow.header
         property Item attached_footer: ApplicationWindow.footer
-        property Item attached_overlay: ApplicationWindow.overlay
 
         Control {
             id: childWindowControl
@@ -113,7 +109,6 @@ ApplicationWindow {
             property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
             property Item attached_header: ApplicationWindow.header
             property Item attached_footer: ApplicationWindow.footer
-            property Item attached_overlay: ApplicationWindow.overlay
         }
 
         Item {
@@ -124,7 +119,6 @@ ApplicationWindow {
             property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
             property Item attached_header: ApplicationWindow.header
             property Item attached_footer: ApplicationWindow.footer
-            property Item attached_overlay: ApplicationWindow.overlay
         }
 
         QtObject {
@@ -135,7 +129,6 @@ ApplicationWindow {
             property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
             property Item attached_header: ApplicationWindow.header
             property Item attached_footer: ApplicationWindow.footer
-            property Item attached_overlay: ApplicationWindow.overlay
         }
     }
 
@@ -152,7 +145,6 @@ ApplicationWindow {
         property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
         property Item attached_header: ApplicationWindow.header
         property Item attached_footer: ApplicationWindow.footer
-        property Item attached_overlay: ApplicationWindow.overlay
 
         Control {
             id: childAppWindowControl
@@ -162,7 +154,6 @@ ApplicationWindow {
             property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
             property Item attached_header: ApplicationWindow.header
             property Item attached_footer: ApplicationWindow.footer
-            property Item attached_overlay: ApplicationWindow.overlay
         }
 
         Item {
@@ -173,7 +164,6 @@ ApplicationWindow {
             property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
             property Item attached_header: ApplicationWindow.header
             property Item attached_footer: ApplicationWindow.footer
-            property Item attached_overlay: ApplicationWindow.overlay
         }
 
         QtObject {
@@ -184,7 +174,6 @@ ApplicationWindow {
             property Item attached_activeFocusControl: ApplicationWindow.activeFocusControl
             property Item attached_header: ApplicationWindow.header
             property Item attached_footer: ApplicationWindow.footer
-            property Item attached_overlay: ApplicationWindow.overlay
         }
     }
 }
diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index b907f5c3..baaa3503 100644
--- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
+++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
@@ -287,7 +287,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QCOMPARE(childControl->property("attached_activeFocusControl").value<QQuickItem *>(), window->activeFocusControl());
     QCOMPARE(childControl->property("attached_header").value<QQuickItem *>(), window->header());
     QCOMPARE(childControl->property("attached_footer").value<QQuickItem *>(), window->footer());
-    QCOMPARE(childControl->property("attached_overlay").value<QQuickItem *>(), window->overlay());
 
     QQuickItem *childItem = object->property("childItem").value<QQuickItem *>();
     QVERIFY(childItem);
@@ -296,7 +295,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QCOMPARE(childItem->property("attached_activeFocusControl").value<QQuickItem *>(), window->activeFocusControl());
     QCOMPARE(childItem->property("attached_header").value<QQuickItem *>(), window->header());
     QCOMPARE(childItem->property("attached_footer").value<QQuickItem *>(), window->footer());
-    QCOMPARE(childItem->property("attached_overlay").value<QQuickItem *>(), window->overlay());
 
     QObject *childObject = object->property("childObject").value<QObject *>();
     QVERIFY(childObject);
@@ -305,7 +303,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childObject->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childObject->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childObject->property("attached_footer").value<QQuickItem *>());
-    QVERIFY(!childObject->property("attached_overlay").value<QQuickItem *>());
 
     QQuickWindow *childWindow = object->property("childWindow").value<QQuickWindow *>();
     QVERIFY(childWindow);
@@ -314,7 +311,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childWindow->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childWindow->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childWindow->property("attached_footer").value<QQuickItem *>());
-    QVERIFY(!childWindow->property("attached_overlay").value<QQuickItem *>());
 
     QQuickItem *childWindowControl = object->property("childWindowControl").value<QQuickItem *>();
     QVERIFY(childWindowControl);
@@ -323,7 +319,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childWindowControl->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childWindowControl->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childWindowControl->property("attached_footer").value<QQuickItem *>());
-    QCOMPARE(childWindowControl->property("attached_overlay").value<QQuickItem *>(), QQuickOverlay::overlay(childWindow));
 
     QQuickItem *childWindowItem = object->property("childWindowItem").value<QQuickItem *>();
     QVERIFY(childWindowItem);
@@ -332,7 +327,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childWindowItem->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childWindowItem->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childWindowItem->property("attached_footer").value<QQuickItem *>());
-    QCOMPARE(childWindowItem->property("attached_overlay").value<QQuickItem *>(), QQuickOverlay::overlay(childWindow));
 
     QObject *childWindowObject = object->property("childWindowObject").value<QObject *>();
     QVERIFY(childWindowObject);
@@ -341,7 +335,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childWindowObject->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childWindowObject->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childWindowObject->property("attached_footer").value<QQuickItem *>());
-    QVERIFY(!childWindowObject->property("attached_overlay").value<QQuickItem *>());
 
     QQuickApplicationWindow *childAppWindow = object->property("childAppWindow").value<QQuickApplicationWindow *>();
     QVERIFY(childAppWindow);
@@ -350,7 +343,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childAppWindow->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childAppWindow->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childAppWindow->property("attached_footer").value<QQuickItem *>());
-    QVERIFY(!childAppWindow->property("attached_overlay").value<QQuickItem *>());
 
     QQuickItem *childAppWindowControl = object->property("childAppWindowControl").value<QQuickItem *>();
     QVERIFY(childAppWindowControl);
@@ -359,7 +351,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QCOMPARE(childAppWindowControl->property("attached_activeFocusControl").value<QQuickItem *>(), childAppWindow->activeFocusControl());
     QCOMPARE(childAppWindowControl->property("attached_header").value<QQuickItem *>(), childAppWindow->header());
     QCOMPARE(childAppWindowControl->property("attached_footer").value<QQuickItem *>(), childAppWindow->footer());
-    QCOMPARE(childAppWindowControl->property("attached_overlay").value<QQuickItem *>(), childAppWindow->overlay());
 
     QQuickItem *childAppWindowItem = object->property("childAppWindowItem").value<QQuickItem *>();
     QVERIFY(childAppWindowItem);
@@ -368,7 +359,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QCOMPARE(childAppWindowItem->property("attached_activeFocusControl").value<QQuickItem *>(), childAppWindow->activeFocusControl());
     QCOMPARE(childAppWindowItem->property("attached_header").value<QQuickItem *>(), childAppWindow->header());
     QCOMPARE(childAppWindowItem->property("attached_footer").value<QQuickItem *>(), childAppWindow->footer());
-    QCOMPARE(childAppWindowItem->property("attached_overlay").value<QQuickItem *>(), childAppWindow->overlay());
 
     QObject *childAppWindowObject = object->property("childAppWindowObject").value<QObject *>();
     QVERIFY(childAppWindowObject);
@@ -377,7 +367,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childAppWindowObject->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childAppWindowObject->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childAppWindowObject->property("attached_footer").value<QQuickItem *>());
-    QVERIFY(!childAppWindowObject->property("attached_overlay").value<QQuickItem *>());
 
     window->show();
     window->requestActivate();
@@ -416,7 +405,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QCOMPARE(childControl->property("attached_activeFocusControl").value<QQuickItem *>(), childAppWindowControl);
     QCOMPARE(childControl->property("attached_header").value<QQuickItem *>(), childAppWindow->header());
     QCOMPARE(childControl->property("attached_footer").value<QQuickItem *>(), childAppWindow->footer());
-    QCOMPARE(childControl->property("attached_overlay").value<QQuickItem *>(), childAppWindow->overlay());
 
     childItem->setParentItem(childAppWindow->contentItem());
     QCOMPARE(childItem->window(), childAppWindow);
@@ -425,7 +413,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QCOMPARE(childItem->property("attached_activeFocusControl").value<QQuickItem *>(), childAppWindowControl);
     QCOMPARE(childItem->property("attached_header").value<QQuickItem *>(), childAppWindow->header());
     QCOMPARE(childItem->property("attached_footer").value<QQuickItem *>(), childAppWindow->footer());
-    QCOMPARE(childItem->property("attached_overlay").value<QQuickItem *>(), childAppWindow->overlay());
 
     childControl->setParentItem(nullptr);
     QVERIFY(!childControl->window());
@@ -434,7 +421,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childControl->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childControl->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childControl->property("attached_footer").value<QQuickItem *>());
-    QVERIFY(!childControl->property("attached_overlay").value<QQuickItem *>());
 
     childItem->setParentItem(nullptr);
     QVERIFY(!childItem->window());
@@ -443,7 +429,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childItem->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childItem->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childItem->property("attached_footer").value<QQuickItem *>());
-    QVERIFY(!childItem->property("attached_overlay").value<QQuickItem *>());
     childAppWindow->close();
     qApp->processEvents();
 
@@ -464,7 +449,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childControl->property("attached_contentItem").value<QQuickItem *>());
     QVERIFY(!childControl->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childControl->property("attached_footer").value<QQuickItem *>());
-    QCOMPARE(childControl->property("attached_overlay").value<QQuickItem *>(), QQuickOverlay::overlay(childWindow));
 
     childItem->setParentItem(childWindow->contentItem());
     QCOMPARE(childItem->window(), childWindow);
@@ -473,7 +457,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childControl->property("attached_contentItem").value<QQuickItem *>());
     QVERIFY(!childControl->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childControl->property("attached_footer").value<QQuickItem *>());
-    QCOMPARE(childControl->property("attached_overlay").value<QQuickItem *>(), QQuickOverlay::overlay(childWindow));
 
     childControl->setParentItem(nullptr);
     QVERIFY(!childControl->window());
@@ -482,7 +465,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childControl->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childControl->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childControl->property("attached_footer").value<QQuickItem *>());
-    QVERIFY(!childControl->property("attached_overlay").value<QQuickItem *>());
 
     childItem->setParentItem(nullptr);
     QVERIFY(!childItem->window());
@@ -491,7 +473,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childItem->property("attached_activeFocusControl").value<QQuickItem *>());
     QVERIFY(!childItem->property("attached_header").value<QQuickItem *>());
     QVERIFY(!childItem->property("attached_footer").value<QQuickItem *>());
-    QVERIFY(!childItem->property("attached_overlay").value<QQuickItem *>());
     childWindow->close();
 }
 
diff --git a/tests/auto/qquickmenu/data/applicationwindow.qml b/tests/auto/qquickmenu/data/applicationwindow.qml
index 986853e4..13f14d2d 100644
--- a/tests/auto/qquickmenu/data/applicationwindow.qml
+++ b/tests/auto/qquickmenu/data/applicationwindow.qml
@@ -59,6 +59,7 @@ ApplicationWindow {
     property alias emptyMenu: emptyMenu
     property alias menu: menu
     property alias menuButton: menuButton
+    property Overlay overlay: menu.Overlay.overlay
 
     Menu {
         id: emptyMenu
diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp
index 54a5d9f4..37d1e5ac 100644
--- a/tests/auto/qquickmenu/tst_qquickmenu.cpp
+++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp
@@ -157,9 +157,12 @@ void tst_QQuickMenu::mouse()
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
+    QVERIFY(menu);
     menu->open();
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
+    QQuickOverlay *overlay = window->property("overlay").value<QQuickOverlay*>();
+    QVERIFY(overlay);
+    QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
     QTRY_VERIFY(menu->isOpened());
 
     QQuickItem *firstItem = menu->itemAt(0);
@@ -182,14 +185,14 @@ void tst_QQuickMenu::mouse()
     QCOMPARE(triggeredSpy.count(), 1);
     QTRY_COMPARE(visibleSpy.count(), 1);
     QVERIFY(!menu->isVisible());
-    QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()));
+    QVERIFY(!overlay->childItems().contains(menu->contentItem()));
     QCOMPARE(menu->currentIndex(), -1);
     QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
 
     menu->open();
     QCOMPARE(visibleSpy.count(), 2);
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
+    QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
     QTRY_VERIFY(menu->isOpened());
 
     // Ensure that we have enough space to click outside of the menu.
@@ -199,12 +202,12 @@ void tst_QQuickMenu::mouse()
         QPoint(menu->contentItem()->width() + 1, menu->contentItem()->height() + 1));
     QTRY_COMPARE(visibleSpy.count(), 3);
     QVERIFY(!menu->isVisible());
-    QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
+    QVERIFY(!overlay->childItems().contains(menu->contentItem()->parentItem()));
 
     menu->open();
     QCOMPARE(visibleSpy.count(), 4);
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
+    QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
     QTRY_VERIFY(menu->isOpened());
 
     // Hover-highlight through the menu items one by one
@@ -237,7 +240,7 @@ void tst_QQuickMenu::mouse()
 //    QCOMPARE(triggeredSpy.count(), 1);
 //    QCOMPARE(visibleSpy.count(), 5);
 //    QVERIFY(!menu->isVisible());
-//    QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()));
+//    QVERIFY(!overlay->childItems().contains(menu->contentItem()));
 //    QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
 }
 
@@ -289,7 +292,9 @@ void tst_QQuickMenu::contextMenuKeyboard()
     menu->open();
     QCOMPARE(visibleSpy.count(), 1);
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
+    QQuickOverlay *overlay = window->property("overlay").value<QQuickOverlay*>();
+    QVERIFY(overlay);
+    QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
     QTRY_VERIFY(menu->isOpened());
     QVERIFY(!firstItem->hasActiveFocus());
     QVERIFY(!firstItem->property("highlighted").toBool());
@@ -322,7 +327,7 @@ void tst_QQuickMenu::contextMenuKeyboard()
     QCOMPARE(secondTriggeredSpy.count(), 1);
     QTRY_COMPARE(visibleSpy.count(), 2);
     QVERIFY(!menu->isVisible());
-    QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()));
+    QVERIFY(!overlay->childItems().contains(menu->contentItem()));
     QVERIFY(!firstItem->hasActiveFocus());
     QVERIFY(!firstItem->hasVisualFocus());
     QVERIFY(!firstItem->isHighlighted());
@@ -352,7 +357,7 @@ void tst_QQuickMenu::contextMenuKeyboard()
     QCOMPARE(firstTriggeredSpy.count(), 1);
     QTRY_COMPARE(visibleSpy.count(), 4);
     QVERIFY(!menu->isVisible());
-    QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()));
+    QVERIFY(!overlay->childItems().contains(menu->contentItem()));
     QVERIFY(!firstItem->hasActiveFocus());
     QVERIFY(!firstItem->hasVisualFocus());
     QVERIFY(!firstItem->isHighlighted());
@@ -365,7 +370,7 @@ void tst_QQuickMenu::contextMenuKeyboard()
     menu->open();
     QCOMPARE(visibleSpy.count(), 5);
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
+    QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
     QTRY_VERIFY(menu->isOpened());
     QVERIFY(!firstItem->hasActiveFocus());
     QVERIFY(!firstItem->hasVisualFocus());