|
 |
462c49 |
From 0bbc2108aa2fe60c32f3fb01926e707cc29e0b81 Mon Sep 17 00:00:00 2001
|
|
|
462c49 |
From: Gatis Paeglis <gatis.paeglis@digia.com>
|
|
|
462c49 |
Date: Sat, 31 Aug 2013 21:22:47 +0200
|
|
|
462c49 |
Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb
|
|
|
462c49 |
layout."
|
|
|
462c49 |
|
|
|
462c49 |
The change which attempted to fix QTBUG-15319 broke keyboard
|
|
|
462c49 |
shortcuts for non latin keyboard layouts.
|
|
|
462c49 |
|
|
|
462c49 |
This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
|
|
|
462c49 |
regression.
|
|
|
462c49 |
|
|
|
462c49 |
Task-number: QTBUG-32908
|
|
|
462c49 |
|
|
|
462c49 |
Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
|
|
|
462c49 |
Reviewed-by: David Faure <david.faure@kdab.com>
|
|
|
462c49 |
---
|
|
|
462c49 |
src/gui/kernel/qkeymapper_x11.cpp | 5 +----
|
|
|
462c49 |
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
462c49 |
|
|
|
462c49 |
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
|
|
|
462c49 |
index 005ff3f..7daa41d 100644
|
|
|
462c49 |
--- a/src/gui/kernel/qkeymapper_x11.cpp
|
|
|
462c49 |
+++ b/src/gui/kernel/qkeymapper_x11.cpp
|
|
|
462c49 |
@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event)
|
|
|
462c49 |
|
|
|
462c49 |
// first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must
|
|
|
462c49 |
// always use them when determining the baseKeySym)
|
|
|
462c49 |
- // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to
|
|
|
462c49 |
- // XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers.
|
|
|
462c49 |
- // See https://bugreports.qt-project.org/browse/QTBUG-15319 .
|
|
|
462c49 |
KeySym baseKeySym;
|
|
|
462c49 |
uint consumedModifiers;
|
|
|
462c49 |
- if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)),
|
|
|
462c49 |
+ if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)),
|
|
|
462c49 |
&consumedModifiers, &baseKeySym))
|
|
|
462c49 |
return QList<int>();
|
|
|
462c49 |
|
|
|
462c49 |
--
|
|
|
462c49 |
1.9.3
|