diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-01-10 20:43:22 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-14 20:45:32 (GMT) |
| commit | 6db96677ab9e1b3d717e3704a658e528b457b255 (patch) | |
| tree | 11057a6d95da3851d41716c3d4dded6719831310 /src | |
| parent | 2e97dd401a09e4a9027dea885db7fd95e961a0c5 (diff) | |
| download | Qt-6db96677ab9e1b3d717e3704a658e528b457b255.zip Qt-6db96677ab9e1b3d717e3704a658e528b457b255.tar.gz Qt-6db96677ab9e1b3d717e3704a658e528b457b255.tar.bz2 | |
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>
(cherry picked from qtbase/b6963f109ad54c6f03b3391d57db9a536d49ba7d)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index d8b0c62..400fd30 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -2820,7 +2820,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); |