1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't send regular key press event if it matched a shortcut

Browse Source 
Regression after ee9621b9dc6cab96df627aa7b926e6256ea2102a.

Change-Id: If4a5595d7f191563d0636ccee20cf0ac8c7c0f1f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
This commit is contained in:
Tor Arne Vestbø 2016-01-29 12:14:09 +01:00
parent 293731cd4b
commit 98dedefd0c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/kernel/qguiapplication.cpp
View File

@ -1959,8 +1959,9 @@ void QGuiApplicationPrivate::processKeyEvent(QWindowSystemInterfacePrivate::KeyE
// FIXME: Include OS X in this code path by passing the key event through // FIXME: Include OS X in this code path by passing the key event through
// QPlatformInputContext::filterEvent(). // QPlatformInputContext::filterEvent().
if (e->keyType == QEvent::KeyPress && window) { if (e->keyType == QEvent::KeyPress && window) {
QWindowSystemInterface::handleShortcutEvent(window, e->timestamp, e->key, e->modifiers, if (QWindowSystemInterface::handleShortcutEvent(window, e->timestamp, e->key, e->modifiers,
e->nativeScanCode, e->nativeVirtualKey, e->nativeModifiers, e->unicode, e->repeat, e->repeatCount); e->nativeScanCode, e->nativeVirtualKey, e->nativeModifiers, e->unicode, e->repeat, e->repeatCount))
return;
} }
#endif #endif