summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorThomas Sondergaard <ts@medical-insight.com>2009-09-14 12:33:39 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-09-14 12:33:55 (GMT)
commitf1710803cc17a50d098e945e86ad75d42b036935 (patch)
treecd89e7dec3421352946941ed9b3e0548da97810b /src/gui
parent2ffcf454806d0167c36bb626f07c3cc969206709 (diff)
downloadQt-f1710803cc17a50d098e945e86ad75d42b036935.zip
Qt-f1710803cc17a50d098e945e86ad75d42b036935.tar.gz
Qt-f1710803cc17a50d098e945e86ad75d42b036935.tar.bz2
Fixed off-by-one error in call to XGetKeyboardMapping that meant that max_keycode wasn't retrieved.
Merge-request: 1308 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qkeymapper_x11.cpp2
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