diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-14 17:07:36 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-14 17:07:36 (GMT) |
| commit | d1edbe110240e5ede67f10cf6620cc6eef26b359 (patch) | |
| tree | b147d4425712bed2df7814bcce36525d64201f4d /src | |
| parent | 0d2d8f944bee6a13bdb50be2468130e937e0c010 (diff) | |
| parent | f1710803cc17a50d098e945e86ad75d42b036935 (diff) | |
| download | Qt-d1edbe110240e5ede67f10cf6620cc6eef26b359.zip Qt-d1edbe110240e5ede67f10cf6620cc6eef26b359.tar.gz Qt-d1edbe110240e5ede67f10cf6620cc6eef26b359.tar.bz2 | |
Merge branch '4.5' into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qkeymapper_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp index 488cc6a..0ce77fe 100644 --- a/src/gui/kernel/qkeymapper_x11.cpp +++ b/src/gui/kernel/qkeymapper_x11.cpp @@ -536,7 +536,7 @@ void QKeyMapperPrivate::clearMappings() coreDesc.keysyms_per_keycode = 0; coreDesc.keysyms = XGetKeyboardMapping(X11->display, coreDesc.min_keycode, - coreDesc.max_keycode - coreDesc.min_keycode, + coreDesc.max_keycode - coreDesc.min_keycode + 1, &coreDesc.keysyms_per_keycode); #if 0 |