summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-01-10 22:43:22 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-14 16:28:21 +0100
commitb6963f109ad54c6f03b3391d57db9a536d49ba7d (patch)
treea4c2a87148d46bddc88de05affa4c51911c971a4 /tests/auto
parent791eb399d2a4c585352930b7b6757a4b29ddda9d (diff)
QMenu: Fix nested popup when keyboard shortcut is used
Task-number: QTBUG-20403 Change-Id: I2a5fe00dd16e9dc1ec0d742a8f48083fc2954996 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 4e5b82a712..9da1dd389a 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -101,6 +101,7 @@ private slots:
void pushButtonPopulateOnAboutToShow();
void QTBUG7907_submenus_autoselect();
void QTBUG7411_submenus_activate();
+ void QTBUG20403_nested_popup_on_shortcut_trigger();
void QTBUG_10735_crashWithDialog();
protected slots:
void onActivated(QAction*);
@@ -895,6 +896,22 @@ void tst_QMenu::QTBUG7411_submenus_activate()
QTRY_VERIFY(sub1.isVisible());
}
+void tst_QMenu::QTBUG20403_nested_popup_on_shortcut_trigger()
+{
+ QMenu menu("Test Menu");
+ QMenu sub1("&sub1");
+ QMenu subsub1("&subsub1");
+ subsub1.addAction("foo");
+ sub1.addMenu(&subsub1);
+ menu.addMenu(&sub1);
+ menu.show();
+ QVERIFY(QTest::qWaitForWindowExposed(&menu));
+ QTest::keyPress(&menu, Qt::Key_S);
+ QTest::qWait(100); // 20ms delay with previous behavior
+ QTRY_VERIFY(sub1.isVisible());
+ QVERIFY(!subsub1.isVisible());
+}
+
class MyMenu : public QMenu
{
Q_OBJECT