diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-11-23 14:48:51 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-11-23 14:53:38 (GMT) |
| commit | 0bad605066f4cacabb2547b9b8895b69dac3d431 (patch) | |
| tree | cfc76017ae9d0b5f2d3670032579fa4ed55a13ac /src/gui/widgets | |
| parent | db5e4496229a776768464d1d3d2e1f8e81bd6ba0 (diff) | |
| download | Qt-0bad605066f4cacabb2547b9b8895b69dac3d431.zip Qt-0bad605066f4cacabb2547b9b8895b69dac3d431.tar.gz Qt-0bad605066f4cacabb2547b9b8895b69dac3d431.tar.bz2 | |
Make the menubar filter out EScape only if there is a current action
Task-number: QTBUG-4965
Reviewed-by: gabi
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index e50de02..40cfe1a 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -1486,7 +1486,8 @@ bool QMenuBar::event(QEvent *e) break; case QEvent::ShortcutOverride: { QKeyEvent *kev = static_cast<QKeyEvent*>(e); - if (kev->key() == Qt::Key_Escape) { + //we only filter out escape if there is a current action + if (kev->key() == Qt::Key_Escape && d->currentAction) { e->accept(); return true; } |