Blame SOURCES/qt-revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb.patch

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