From 663b742ca8b289e6456facf8b6a8ca18a4157fb7 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 13 Jan 2014 11:12:34 +0100 Subject: [PATCH] Windows: Do not try to update keymap on WM_IME_CHAR messages Task-number: QTBUG-35806 Change-Id: Ie1082353155aa7ee61f49f2fbcbfdb01d57e797c Reviewed-by: Friedemann Kleint (cherry picked from commit 0c09d2ccb9b46138a908950d65a49aa58dd55062) --- src/gui/kernel/qkeymapper_win.cpp | 4 ++-- 1 file 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; -- 2.1.4