[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#719064: qt4-x11: keyboard shortcuts don't work in multi-language mode



> https://qt.gitorious.org/qt/qt/commit/0c03af0

Updated patch is in attachment. "Origin" field was changed: now it points to
the commit in primary Git repo.

Best regards,
Boris
From bc1e27e7224f5b4faff7a60ba756d3209f74e172 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sun, 1 Sep 2013 19:18:54 +0300
Subject: [PATCH] Add fix-keyboard-shortcuts-in-multi-language-mode.patch

---
 .../fix-keyboard-shortcuts-in-multi-language-mode.patch | 17 +++++++++++++++++
 debian/patches/series                                   |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 debian/patches/fix-keyboard-shortcuts-in-multi-language-mode.patch

diff --git a/debian/patches/fix-keyboard-shortcuts-in-multi-language-mode.patch b/debian/patches/fix-keyboard-shortcuts-in-multi-language-mode.patch
new file mode 100644
index 0000000..b88ed86
--- /dev/null
+++ b/debian/patches/fix-keyboard-shortcuts-in-multi-language-mode.patch
@@ -0,0 +1,17 @@
+Description: fix keyboard shortcuts in multi-language mode
+Origin: https://qt.gitorious.org/qt/qt/commit/0c03af0
+Bug: https://bugreports.qt-project.org/browse/QTBUG-32908
+Bug-Debian: http://bugs.debian.org/719064
+
+diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
+--- a/src/gui/kernel/qkeymapper_x11.cpp
++++ b/src/gui/kernel/qkeymapper_x11.cpp
+@@ -287,7 +287,7 @@
+     //       See https://bugreports.qt-project.org/browse/QTBUG-15319 .
+     KeySym baseKeySym;
+     uint consumedModifiers;
+-    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)),
++    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)),
+                          &consumedModifiers, &baseKeySym))
+         return QList<int>();
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 286d023..98fb068 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,3 +44,4 @@ no_libicu_message.diff
 QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
 qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
 qtdoc-build-offline-docs.patch
+fix-keyboard-shortcuts-in-multi-language-mode.patch
-- 
1.8.4.rc3


Reply to: