Commit 51568b59 authored by Daniel Molkentin's avatar Daniel Molkentin
Browse files

Shortcut dialogs: Make it possible to use Accel Keyboard Shortcuts

Fixes: QTCREATORBUG-810

Reviewed-By: con
parent f2ce73bf
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment