diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2014-01-13 10:12:34 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 07:10:11 (GMT) |
| commit | 663b742ca8b289e6456facf8b6a8ca18a4157fb7 (patch) | |
| tree | dd424802e4c9e15424356b7decb254c574226155 | |
| parent | f0be67b54d2b82ef57c9e3ff02b89e92b0ce2e96 (diff) | |
| download | Qt-663b742ca8b289e6456facf8b6a8ca18a4157fb7.zip Qt-663b742ca8b289e6456facf8b6a8ca18a4157fb7.tar.gz Qt-663b742ca8b289e6456facf8b6a8ca18a4157fb7.tar.bz2 | |
Windows: Do not try to update keymap on WM_IME_CHAR messages
Task-number: QTBUG-35806
Change-Id: Ie1082353155aa7ee61f49f2fbcbfdb01d57e797c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from commit 0c09d2ccb9b46138a908950d65a49aa58dd55062)
| -rw-r--r-- | src/gui/kernel/qkeymapper_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/kernel/qkeymapper_win.cpp index b88186e..14c24d2 100644 --- a/src/gui/kernel/qkeymapper_win.cpp +++ b/src/gui/kernel/qkeymapper_win.cpp @@ -803,10 +803,10 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, const MSG &msg, bool bool k0 = false; bool k1 = false; int msgType = msg.message; - // WM_CHAR messages already contain the character in question so there is + // WM_(IME_)CHAR messages already contain the character in question so there is // no need to fiddle with our key map. In any other case add this key to the // keymap if it is not present yet. - if (msg.message != WM_CHAR) + if (msg.message != WM_CHAR && msg.message != WM_IME_CHAR) updateKeyMap(msg); const quint32 scancode = (msg.lParam >> 16) & scancodeBitmask; |