Menu: Close menu by Alt key on platforms supporting mnemonic shortcuts

This is close to what the widget QMenu (and Windows native menu) do.
Before, the active menu was left open and Alt+<key> shortcut would be
delivered to one of the matching items, which might be an item shadowed
by the active menu popup.

With this patch, the active menu is closed on Alt key pressed so the
subsequent shortcut event will (likely) be delivered to the matching
MenuBar item. Since I'm going to fix the issue of &mnemonic key conflict
resolution, I need to first change the way of delivering a shortcut
event to the parent MenuBar.

The test cases use the undocumented function to simulate low-level
behavior of Alt itself and Alt+<key> events. Apparently, there's no
public QTest function to send multiple key events without releasing Alt
modifier.

Task-number: QTBUG-86276
Pick-to: 5.15
Change-Id: I0ed6ea94f0fee7983a5cb6352d388036d3a1f8df
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 10 insertions, 4 deletions

diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp
index a06b715f..d1b50357 100644
--- a/tests/auto/qquickmenu/tst_qquickmenu.cpp
+++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp
@@ -533,6 +533,8 @@ void tst_QQuickMenu::mnemonics()
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
 
+    MnemonicKeySimulator keySim(window);
+
     QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
     QQuickAction *action = window->property("action").value<QQuickAction *>();
     QQuickMenuItem *menuItem = window->property("menuItem").value<QQuickMenuItem *>();
@@ -540,12 +542,13 @@ void tst_QQuickMenu::mnemonics()
     QQuickMenuItem *subMenuItem = window->property("subMenuItem").value<QQuickMenuItem *>();
     QVERIFY(menu && action && menuItem && subMenu && subMenuItem);
 
+    keySim.press(Qt::Key_Alt);
     menu->open();
     QTRY_VERIFY(menu->isOpened());
 
     QSignalSpy actionSpy(action, &QQuickAction::triggered);
     QVERIFY(actionSpy.isValid());
-    QTest::keyClick(window, Qt::Key_A, Qt::AltModifier); // "&Action"
+    keySim.click(Qt::Key_A); // "&Action"
     QCOMPARE(actionSpy.count(), 1);
 
     menu->open();
@@ -553,18 +556,21 @@ void tst_QQuickMenu::mnemonics()
 
     QSignalSpy menuItemSpy(menuItem, &QQuickMenuItem::triggered);
     QVERIFY(menuItemSpy.isValid());
-    QTest::keyClick(window, Qt::Key_I, Qt::AltModifier); // "Menu &Item"
+    keySim.click(Qt::Key_I); // "Menu &Item"
+    keySim.release(Qt::Key_Alt);
     QCOMPARE(menuItemSpy.count(), 1);
 
+    keySim.press(Qt::Key_Alt);
     menu->open();
     QTRY_VERIFY(menu->isOpened());
 
-    QTest::keyClick(window, Qt::Key_M, Qt::AltModifier); // "Sub &Menu"
+    keySim.click(Qt::Key_M); // "Sub &Menu"
     QTRY_VERIFY(subMenu->isOpened());
 
     QSignalSpy subMenuItemSpy(subMenuItem, &QQuickMenuItem::triggered);
     QVERIFY(subMenuItemSpy.isValid());
-    QTest::keyClick(window, Qt::Key_S, Qt::AltModifier); // "&Sub Menu Item"
+    keySim.click(Qt::Key_S); // "&Sub Menu Item"
+    keySim.release(Qt::Key_Alt);
     QCOMPARE(subMenuItemSpy.count(), 1);
 }