[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-11-4-g48b8fe4

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=5be2f3a

The following commit has been merged in the master branch:
commit 5be2f3a7a8f1339af0ad3b5a25490f9b447d7391
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jan 6 11:13:04 2016 -0300

    Backport xcb_dont_select_XInput_events_on_root_window.patch
    
    Closes: #807528
---
 debian/changelog                                   |  4 ++
 debian/patches/series                              |  1 +
 ..._dont_select_XInput_events_on_root_window.patch | 45 ++++++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 03eeac5..6a6ffb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.5.1+dfsg-12) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Backport xcb_dont_select_XInput_events_on_root_window.patch
+    (Closes: #807528).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Jan 2016 11:10:50 -0300
 
 qtbase-opensource-src (5.5.1+dfsg-11) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 8e8f11c..e92ba2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@ qnetworkaccessmanager_accessibility.diff
 uic_qvalidator_qtgui.diff
 Fix-crash-on-exit-caused-by-QStringLiterals.patch
 multiscreen.diff
+xcb_dont_select_XInput_events_on_root_window.patch
 
 # Debian specific.
 gnukfreebsd.diff
diff --git a/debian/patches/xcb_dont_select_XInput_events_on_root_window.patch b/debian/patches/xcb_dont_select_XInput_events_on_root_window.patch
new file mode 100644
index 0000000..1388202
--- /dev/null
+++ b/debian/patches/xcb_dont_select_XInput_events_on_root_window.patch
@@ -0,0 +1,45 @@
+From 2d8b0d1cd566cc0c3ab600650b66cdc771d8314f Mon Sep 17 00:00:00 2001
+From: Shawn Rutledge <shawn.rutledge at digia.com>
+Date: Mon, 4 Jan 2016 15:09:10 +0100
+Subject: [PATCH] xcb: don't select XInput events on the root window
+
+If we select XInput events, then when the mouse is clicked, there will
+not be a fallback to a core pointer event. But a typical Qt application
+doesn't own the root window.  If the window manager (such as OpenBox,
+Awesome or fvwm) relies on receiving core pointer click events, e.g.
+to show a desktop menu, then each time a device is hotplugged while a
+Qt application is running, we would select XI2 events and thereby
+prevent the window manager from receiving them.
+
+QDesktopWidget's native window is added to m_mapper, even when
+it isn't mapped.  Then after hotplugging there's a hierarchy event,
+and that calls xi2Select for every window in m_mapper.  The assumption
+with this patch is that the root window does need to be in m_mapper
+in case the QDesktopWidget is shown (that was done already in Qt 5.1:
+fca94fa5ed8321e84e7b0ff515620fbb901db545), but xi2Select must avoid
+selecting XI2 events on it to fix this bug.
+
+Task-number: QTBUG-49952
+Change-Id: I5c160e879d93fadfce14120ef2e89a4f71d4f599
+Reviewed-by: Uli Schlachter <psychon at znc.in>
+Reviewed-by: Paul Olav Tvete <paul.tvete at theqtcompany.com>
+---
+ src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+index 1a12370..1b84de4 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
++++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+@@ -274,7 +274,7 @@ void QXcbConnection::finalizeXInput2()
+ 
+ void QXcbConnection::xi2Select(xcb_window_t window)
+ {
+-    if (!m_xi2Enabled)
++    if (!m_xi2Enabled || window == rootWindow())
+         return;
+ 
+     Display *xDisplay = static_cast<Display *>(m_xlib_display);
+-- 
+2.7.0.rc3
+

-- 
qtbase packaging