diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2014-01-30 13:23:01 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 14:27:51 (GMT) |
| commit | cde852d4d4bde80ed7db880be363bf5cd95198f6 (patch) | |
| tree | 24ee5678587937507be106e1098ddbb99100d172 /src/gui/kernel/qkeymapper_win.cpp | |
| parent | 4c83c6ba64ee77157ecaf6a652994a5cb887c96f (diff) | |
| download | Qt-cde852d4d4bde80ed7db880be363bf5cd95198f6.zip Qt-cde852d4d4bde80ed7db880be363bf5cd95198f6.tar.gz Qt-cde852d4d4bde80ed7db880be363bf5cd95198f6.tar.bz2 | |
Win: Fixed assert in QKeyMapperPrivate::possibleKeys
Trying to detect key combinations for events that have an invalid
virtual key will fail in any case and does not make sense.
Task-number: QTBUG-36061
Change-Id: Ia30cb7bf6c7bae06eb84c23b356a53a2eb6e86aa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/gui/kernel/qkeymapper_win.cpp')
| -rw-r--r-- | src/gui/kernel/qkeymapper_win.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/kernel/qkeymapper_win.cpp index 14c24d2..b3c067f 100644 --- a/src/gui/kernel/qkeymapper_win.cpp +++ b/src/gui/kernel/qkeymapper_win.cpp @@ -773,8 +773,11 @@ extern bool qt_use_rtl_extensions; QList<int> QKeyMapperPrivate::possibleKeys(QKeyEvent *e) { QList<int> result; + const quint32 nativeVirtualKey = e->nativeVirtualKey(); + if (nativeVirtualKey > 255) + return result; - KeyboardLayoutItem *kbItem = keyLayout[e->nativeVirtualKey()]; + KeyboardLayoutItem *kbItem = keyLayout[nativeVirtualKey]; if(!kbItem) return result; |