Remove redundant calls to requestActivate in tst_QQuickMenu

tst_QQuickMenu include calls to requestActivate() after a window is
shown. This call is superfluous for the current test and should be removed.

Remove the unnecessary requestActivate() calls to simplify the code.

Task-number: QTBUG-139705
Change-Id: Ib36a44ed386fdc3fff4b91c7df34b8f5e9c777a3
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 2444d81fc58d5ea46ce9f650515566234ffdfdf9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5b799d5ca7eed71e6eac8a0329362f3225f9f1c1)

1 files changed, 0 insertions, 15 deletions

diff --git a/tests/auto/quickcontrols/qquickmenu/tst_qquickmenu.cpp b/tests/auto/quickcontrols/qquickmenu/tst_qquickmenu.cpp
index 1d69c1b586..d417f4a3ba 100644
--- a/tests/auto/quickcontrols/qquickmenu/tst_qquickmenu.cpp
+++ b/tests/auto/quickcontrols/qquickmenu/tst_qquickmenu.cpp
@@ -234,7 +234,6 @@ void tst_QQuickMenu::mouse()
     centerOnScreen(window);
     moveMouseAway(window);
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
@@ -397,7 +396,6 @@ void tst_QQuickMenu::contextMenuKeyboard()
     moveMouseAway(window);
     window->show();
     QVERIFY(QTest::qWaitForWindowExposed(window));
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(QGuiApplication::focusWindow() == window);
 
@@ -624,7 +622,6 @@ void tst_QQuickMenu::disabledMenuItemKeyNavigation()
     centerOnScreen(window);
     moveMouseAway(window);
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(QGuiApplication::focusWindow() == window);
 
@@ -689,7 +686,6 @@ void tst_QQuickMenu::mnemonics()
 
     QQuickWindow *window = helper.window;
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     MnemonicKeySimulator keySim(window);
@@ -892,7 +888,6 @@ void tst_QQuickMenu::checkableMnemonics()
 
     QQuickWindow *window = helper.window;
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     window->setProperty("checkable", checkable);
@@ -954,7 +949,6 @@ void tst_QQuickMenu::menuButton()
 
     QQuickApplicationWindow *window = helper.appWindow;
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(QGuiApplication::focusWindow() == window);
 
@@ -1007,7 +1001,6 @@ void tst_QQuickMenu::menuSeparator()
     centerOnScreen(window);
     moveMouseAway(window);
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
@@ -1441,7 +1434,6 @@ void tst_QQuickMenu::actionShortcuts()
     QVERIFY2(helper.ready, helper.failureMessage());
     QQuickWindow *window = helper.window;
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     // Try the menu's shortcut.
@@ -1777,7 +1769,6 @@ void tst_QQuickMenu::subMenuKeyboard()
     centerOnScreen(window);
     moveMouseAway(window);
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     if (mirrored) {
@@ -1908,7 +1899,6 @@ void tst_QQuickMenu::subMenuDisabledKeyboard()
     centerOnScreen(window);
     moveMouseAway(window);
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     if (mirrored) {
@@ -2718,7 +2708,6 @@ void tst_QQuickMenu::giveMenuItemFocusOnButtonPress()
     QVERIFY2(helper.ready, helper.failureMessage());
     QQuickApplicationWindow *window = helper.appWindow;
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     // Press enter on the button to open the menu.
@@ -3295,7 +3284,6 @@ void tst_QQuickMenu::effectivePosition()
     QQuickApplicationWindow *window = helper.appWindow;
     centerOnScreen(window);
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
@@ -3420,7 +3408,6 @@ void tst_QQuickMenu::resetCurrentIndexUponPopup()
     centerOnScreen(window);
     moveMouseAway(window);
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
@@ -3503,7 +3490,6 @@ void tst_QQuickMenu::shortcutInNestedSubMenuAction()
     QVERIFY2(helper.ready, helper.failureMessage());
     QQuickApplicationWindow *window = helper.appWindow;
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
     // Shouldn't result in an infinite loop.
@@ -3537,7 +3523,6 @@ void tst_QQuickMenu::loadMenuAsynchronously()
     QQuickView window(testFileUrl("loadMenuAsynchronously.qml"));
     QCOMPARE(window.status(), QQuickView::Ready);
     window.show();
-    window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
 
     auto *rootItem = window.rootObject();