AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed another assert in qwindowskeymapper

Browse Source 
When we get a WM_CHAR message we do not need to add anything to the key
map as these messages already contain the character code in question.

Task-number: QTBUG-35532

Change-Id: If73993cd873b7c616876b9ba52ceba6b27a6a7b1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Oliver Wolff 2013-12-16 14:56:59 +01:00 committed by The Qt Project
parent ac90b4c46f
commit 8e2f95e5a2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/windows/qwindowskeymapper.cpp
View File

@ -743,8 +743,11 @@ bool QWindowsKeyMapper::translateKeyEvent(QWindow *widget, HWND hwnd,
return true; return true;
} }
// Add this key to the keymap if it is not present yet. // WM_CHAR messages already contain the character in question so there is
updateKeyMap(msg); // 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)
updateKeyMap(msg);
MSG peekedMsg; MSG peekedMsg;
// consume dead chars?(for example, typing '`','a' resulting in a-accent). // consume dead chars?(for example, typing '`','a' resulting in a-accent).