diff options
| author | Darrell Anderson <[email protected]> | 2012-08-08 15:38:47 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-08 15:38:47 -0500 |
| commit | 785106b36c47923c338b6d3d61584eea448863ca (patch) | |
| tree | 6b2bbbde4a5ff5e43c1c9ec31ad0bd72ea43e0df /src/kernel/qapplication_x11.cpp | |
| parent | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (diff) | |
| parent | 43db215f601fd50f1fd8b502fae30c75c1bdee4a (diff) | |
| download | tqt3-785106b36c47923c338b6d3d61584eea448863ca.tar.gz tqt3-785106b36c47923c338b6d3d61584eea448863ca.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index abf1e9538..03e7a7794 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -2147,7 +2147,7 @@ void tqt_init_internal( int *argcptr, char **argv, for (i = 0; i < map->max_keypermod; i++) { if (map->modifiermap[mapIndex]) { KeySym sym = - XKeycodeToKeysym(appDpy, map->modifiermap[mapIndex], 0); + XkbKeycodeToKeysym(appDpy, map->modifiermap[mapIndex], 0, 0); if ( qt_alt_mask == 0 && ( sym == XK_Alt_L || sym == XK_Alt_R ) ) { qt_alt_mask = 1 << maskIndex; @@ -2177,7 +2177,7 @@ void tqt_init_internal( int *argcptr, char **argv, for ( i = 0; i < map->max_keypermod; i++ ) { if ( map->modifiermap[ mapIndex ] ) { KeySym sym = - XKeycodeToKeysym( appDpy, map->modifiermap[ mapIndex ], 0 ); + XkbKeycodeToKeysym( appDpy, map->modifiermap[ mapIndex ], 0, 0 ); if ( sym == XK_Mode_switch ) { qt_mode_switch_remove_mask |= 1 << maskIndex; } |