summaryrefslogtreecommitdiffstats
path: root/src
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 /src
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 'src')
-rw-r--r--src/widgets/widgets/qmenu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 17f9ca7911..b3fc6524c5 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -2722,7 +2722,7 @@ void QMenu::keyPressEvent(QKeyEvent *e)
key_consumed = true;
if(d->scroll)
d->scrollMenu(nextAction, QMenuPrivate::QMenuScroller::ScrollCenter, false);
- d->setCurrentAction(nextAction, 20, QMenuPrivate::SelectedFromElsewhere, true);
+ d->setCurrentAction(nextAction, 0, QMenuPrivate::SelectedFromElsewhere, true);
if (!nextAction->menu() && activateAction) {
d->setSyncAction();
d->activateAction(nextAction, QAction::Trigger);