From 51568b59745eeaf3f16f4ec5d451728a72a9aea2 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Wed, 17 Mar 2010 15:46:24 +0100
Subject: [PATCH] Shortcut dialogs: Make it possible to use Accel Keyboard
Shortcuts
Fixes: QTCREATORBUG-810
Reviewed-By: con
---
src/plugins/coreplugin/dialogs/shortcutsettings.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 7dc83c6b2d7..2dcacc4b46d 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -116,8 +116,6 @@ void ShortcutSettings::finish()
bool ShortcutSettings::eventFilter(QObject *o, QEvent *e)
{
- Q_UNUSED(o)
-
if ( e->type() == QEvent::KeyPress ) {
QKeyEvent *k = static_cast<QKeyEvent*>(e);
handleKeyEvent(k);
@@ -125,9 +123,15 @@ bool ShortcutSettings::eventFilter(QObject *o, QEvent *e)
}
if ( e->type() == QEvent::Shortcut ||
- e->type() == QEvent::ShortcutOverride ||
- e->type() == QEvent::KeyRelease )
+ e->type() == QEvent::KeyRelease ) {
return true;
+ }
+
+ if (e->type() == QEvent::ShortcutOverride) {
+ // for shortcut overrides, we need to accept as well
+ e->accept();
+ return true;
+ }
return false;
}
--
GitLab