diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-07-17 14:43:34 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-07-17 14:43:34 +0000 |
| commit | dcc301abfa7b6535199d028ad1afc15daa2d1200 (patch) | |
| tree | 44a4688bc490f0d57d31a361455b8bde1ffd3dbf /src/gui/kernel | |
| parent | 5443da6c2795255db55697471190b3eba16b28dc (diff) | |
| parent | b2603b76655ac819e43c063bb6f16bc95f358083 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into HEAD" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index b56a9da255..2a451453d0 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1889,7 +1889,7 @@ void QGuiApplicationPrivate::processKeyEvent(QWindowSystemInterfacePrivate::KeyE #if !defined(Q_OS_OSX) // On OS X the shortcut override is checked earlier, see: QWindowSystemInterface::handleKeyEvent() const bool checkShortcut = e->keyType == QEvent::KeyPress && window != 0; - if (checkShortcut && QWindowSystemInterface::tryHandleShortcutEvent(window, e->timestamp, e->key, e->modifiers, e->unicode)) + if (checkShortcut && QWindowSystemInterface::tryHandleShortcutEvent(window, e->timestamp, e->key, e->modifiers, e->unicode, e->repeat, e->repeatCount)) return; #endif // Q_OS_OSX |