From 31fbd97b0e39e14f79d0d7be6fd277ebd6a2fa7a Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 5 Jun 2020 13:31:53 +0200 Subject: 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 --- .../tst_qquickapplicationwindow.cpp | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp') 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(), window->activeFocusControl()); QCOMPARE(childControl->property("attached_header").value(), window->header()); QCOMPARE(childControl->property("attached_footer").value(), window->footer()); - QCOMPARE(childControl->property("attached_overlay").value(), window->overlay()); QQuickItem *childItem = object->property("childItem").value(); QVERIFY(childItem); @@ -296,7 +295,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QCOMPARE(childItem->property("attached_activeFocusControl").value(), window->activeFocusControl()); QCOMPARE(childItem->property("attached_header").value(), window->header()); QCOMPARE(childItem->property("attached_footer").value(), window->footer()); - QCOMPARE(childItem->property("attached_overlay").value(), window->overlay()); QObject *childObject = object->property("childObject").value(); QVERIFY(childObject); @@ -305,7 +303,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childObject->property("attached_activeFocusControl").value()); QVERIFY(!childObject->property("attached_header").value()); QVERIFY(!childObject->property("attached_footer").value()); - QVERIFY(!childObject->property("attached_overlay").value()); QQuickWindow *childWindow = object->property("childWindow").value(); QVERIFY(childWindow); @@ -314,7 +311,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childWindow->property("attached_activeFocusControl").value()); QVERIFY(!childWindow->property("attached_header").value()); QVERIFY(!childWindow->property("attached_footer").value()); - QVERIFY(!childWindow->property("attached_overlay").value()); QQuickItem *childWindowControl = object->property("childWindowControl").value(); QVERIFY(childWindowControl); @@ -323,7 +319,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childWindowControl->property("attached_activeFocusControl").value()); QVERIFY(!childWindowControl->property("attached_header").value()); QVERIFY(!childWindowControl->property("attached_footer").value()); - QCOMPARE(childWindowControl->property("attached_overlay").value(), QQuickOverlay::overlay(childWindow)); QQuickItem *childWindowItem = object->property("childWindowItem").value(); QVERIFY(childWindowItem); @@ -332,7 +327,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childWindowItem->property("attached_activeFocusControl").value()); QVERIFY(!childWindowItem->property("attached_header").value()); QVERIFY(!childWindowItem->property("attached_footer").value()); - QCOMPARE(childWindowItem->property("attached_overlay").value(), QQuickOverlay::overlay(childWindow)); QObject *childWindowObject = object->property("childWindowObject").value(); QVERIFY(childWindowObject); @@ -341,7 +335,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childWindowObject->property("attached_activeFocusControl").value()); QVERIFY(!childWindowObject->property("attached_header").value()); QVERIFY(!childWindowObject->property("attached_footer").value()); - QVERIFY(!childWindowObject->property("attached_overlay").value()); QQuickApplicationWindow *childAppWindow = object->property("childAppWindow").value(); QVERIFY(childAppWindow); @@ -350,7 +343,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childAppWindow->property("attached_activeFocusControl").value()); QVERIFY(!childAppWindow->property("attached_header").value()); QVERIFY(!childAppWindow->property("attached_footer").value()); - QVERIFY(!childAppWindow->property("attached_overlay").value()); QQuickItem *childAppWindowControl = object->property("childAppWindowControl").value(); QVERIFY(childAppWindowControl); @@ -359,7 +351,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QCOMPARE(childAppWindowControl->property("attached_activeFocusControl").value(), childAppWindow->activeFocusControl()); QCOMPARE(childAppWindowControl->property("attached_header").value(), childAppWindow->header()); QCOMPARE(childAppWindowControl->property("attached_footer").value(), childAppWindow->footer()); - QCOMPARE(childAppWindowControl->property("attached_overlay").value(), childAppWindow->overlay()); QQuickItem *childAppWindowItem = object->property("childAppWindowItem").value(); QVERIFY(childAppWindowItem); @@ -368,7 +359,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QCOMPARE(childAppWindowItem->property("attached_activeFocusControl").value(), childAppWindow->activeFocusControl()); QCOMPARE(childAppWindowItem->property("attached_header").value(), childAppWindow->header()); QCOMPARE(childAppWindowItem->property("attached_footer").value(), childAppWindow->footer()); - QCOMPARE(childAppWindowItem->property("attached_overlay").value(), childAppWindow->overlay()); QObject *childAppWindowObject = object->property("childAppWindowObject").value(); QVERIFY(childAppWindowObject); @@ -377,7 +367,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childAppWindowObject->property("attached_activeFocusControl").value()); QVERIFY(!childAppWindowObject->property("attached_header").value()); QVERIFY(!childAppWindowObject->property("attached_footer").value()); - QVERIFY(!childAppWindowObject->property("attached_overlay").value()); window->show(); window->requestActivate(); @@ -416,7 +405,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QCOMPARE(childControl->property("attached_activeFocusControl").value(), childAppWindowControl); QCOMPARE(childControl->property("attached_header").value(), childAppWindow->header()); QCOMPARE(childControl->property("attached_footer").value(), childAppWindow->footer()); - QCOMPARE(childControl->property("attached_overlay").value(), childAppWindow->overlay()); childItem->setParentItem(childAppWindow->contentItem()); QCOMPARE(childItem->window(), childAppWindow); @@ -425,7 +413,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QCOMPARE(childItem->property("attached_activeFocusControl").value(), childAppWindowControl); QCOMPARE(childItem->property("attached_header").value(), childAppWindow->header()); QCOMPARE(childItem->property("attached_footer").value(), childAppWindow->footer()); - QCOMPARE(childItem->property("attached_overlay").value(), childAppWindow->overlay()); childControl->setParentItem(nullptr); QVERIFY(!childControl->window()); @@ -434,7 +421,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childControl->property("attached_activeFocusControl").value()); QVERIFY(!childControl->property("attached_header").value()); QVERIFY(!childControl->property("attached_footer").value()); - QVERIFY(!childControl->property("attached_overlay").value()); childItem->setParentItem(nullptr); QVERIFY(!childItem->window()); @@ -443,7 +429,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childItem->property("attached_activeFocusControl").value()); QVERIFY(!childItem->property("attached_header").value()); QVERIFY(!childItem->property("attached_footer").value()); - QVERIFY(!childItem->property("attached_overlay").value()); childAppWindow->close(); qApp->processEvents(); @@ -464,7 +449,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childControl->property("attached_contentItem").value()); QVERIFY(!childControl->property("attached_header").value()); QVERIFY(!childControl->property("attached_footer").value()); - QCOMPARE(childControl->property("attached_overlay").value(), 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()); QVERIFY(!childControl->property("attached_header").value()); QVERIFY(!childControl->property("attached_footer").value()); - QCOMPARE(childControl->property("attached_overlay").value(), QQuickOverlay::overlay(childWindow)); childControl->setParentItem(nullptr); QVERIFY(!childControl->window()); @@ -482,7 +465,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childControl->property("attached_activeFocusControl").value()); QVERIFY(!childControl->property("attached_header").value()); QVERIFY(!childControl->property("attached_footer").value()); - QVERIFY(!childControl->property("attached_overlay").value()); childItem->setParentItem(nullptr); QVERIFY(!childItem->window()); @@ -491,7 +473,6 @@ void tst_QQuickApplicationWindow::attachedProperties() QVERIFY(!childItem->property("attached_activeFocusControl").value()); QVERIFY(!childItem->property("attached_header").value()); QVERIFY(!childItem->property("attached_footer").value()); - QVERIFY(!childItem->property("attached_overlay").value()); childWindow->close(); } -- cgit v1.2.3