diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-26 08:44:33 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-26 08:44:33 (GMT) |
| commit | 540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf (patch) | |
| tree | 8ee7e6d700de3d911e8d0ccf4e2b2cd0a417fcde /src/gui/kernel/qkeymapper_win.cpp | |
| parent | 84fd26983a40ecae3e761106aa8f550c3b7fd7ba (diff) | |
| parent | 7944ac1fb6eb0ae3bbbfdf6780b52f7174174a93 (diff) | |
| download | Qt-540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf.zip Qt-540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf.tar.gz Qt-540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/gui/kernel/qkeymapper_win.cpp')
| -rw-r--r-- | src/gui/kernel/qkeymapper_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/kernel/qkeymapper_win.cpp index 578f32a..e555c5c 100644 --- a/src/gui/kernel/qkeymapper_win.cpp +++ b/src/gui/kernel/qkeymapper_win.cpp @@ -619,7 +619,7 @@ void QKeyMapperPrivate::clearMappings() /* MAKELCID()'s first argument is a WORD, and GetKeyboardLayout() * returns a DWORD. */ - LCID newLCID = MAKELCID((DWORD)GetKeyboardLayout(0), SORT_DEFAULT); + LCID newLCID = MAKELCID((quintptr)GetKeyboardLayout(0), SORT_DEFAULT); // keyboardInputLocale = qt_localeFromLCID(newLCID); bool bidi = false; |