diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-09-14 15:39:49 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-09-14 15:39:49 -0300 |
| commit | 8b027aad56e6df6747c1b6eae35adc0032d2d19f (patch) | |
| tree | 712625729692ded68742ea0a19c48443a1139c18 | |
| parent | 46de8157324c12fce354d898e1829f9b3f90e4c6 (diff) | |
| download | qt4-x11-8b027aad56e6df6747c1b6eae35adc0032d2d19f.tar.gz | |
The shortcut's patch is included in this snapshot.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/fix_shortcuts_with_secondary_xkb_layout.patch | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog index eeead1e..3d53ca0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,8 @@ qt4-x11 (4:4.8.5+git121-g2a9ea11+dfsg-1) UNRELEASED; urgency=low [ Lisandro Damián Nicanor Pérez Meyer ] * Upstream snapshot, git v4.8.5+git121-g2a9ea11. - * Add fix_shortcuts_with_secondary_xkb_layout.patch taken from upstream. - Thanks Boris Pek for pointing it out (Closes: #719064). + * Fix shortcuts with_secondary xkb layout (Closes: #719064). + Thanks Boris Pek for pointing it out. * Refresh patches. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 13 Sep 2013 12:36:03 -0300 diff --git a/debian/patches/fix_shortcuts_with_secondary_xkb_layout.patch b/debian/patches/fix_shortcuts_with_secondary_xkb_layout.patch deleted file mode 100644 index 0cb948f..0000000 --- a/debian/patches/fix_shortcuts_with_secondary_xkb_layout.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8660bb907ef132f2c7c774a7b05f96bf8cab00e6 Mon Sep 17 00:00:00 2001 -From: Gatis Paeglis <gatis.paeglis@digia.com> -Date: Sat, 31 Aug 2013 21:22:47 +0200 -Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb - layout." - -The change which attempted to fix QTBUG-15319 broke keyboard -shortcuts for non latin keyboard layouts. - -This patch reverts QTBUG-15319 (f45cdeda8) since it caused a -regression. - -Task-number: QTBUG-32908 - -Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7 ---- - src/gui/kernel/qkeymapper_x11.cpp | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp -index 005ff3f..7daa41d 100644 ---- a/src/gui/kernel/qkeymapper_x11.cpp -+++ b/src/gui/kernel/qkeymapper_x11.cpp -@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event) - - // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must - // always use them when determining the baseKeySym) -- // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to -- // XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers. -- // 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>(); - --- -1.8.4.rc3 - diff --git a/debian/patches/series b/debian/patches/series index 1c4ead0..286d023 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,6 @@ Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch Add-support-for-the-Linux-m68k-platform.patch -fix_shortcuts_with_secondary_xkb_layout.patch # qt-copy patches 0195-compositing-properties.diff |