Merge dev into 5.5

Change-Id: Id6dbbbfc542c214fe695c6795c6aaf23aedc1cd1

1 files changed, 17 insertions, 15 deletions

diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index c63a9c88bc..f225518cb9 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@@ -274,21 +274,23 @@ void QXcbConnection::xi2Select(xcb_window_t window)
     unsigned char *xiBitMask = reinterpret_cast<unsigned char *>(&bitMask);
 
 #ifdef XCB_USE_XINPUT22
-    bitMask |= XI_TouchBeginMask;
-    bitMask |= XI_TouchUpdateMask;
-    bitMask |= XI_TouchEndMask;
-    XIEventMask mask;
-    mask.mask_len = sizeof(bitMask);
-    mask.mask = xiBitMask;
-    if (!m_touchDevices.isEmpty()) {
-        mask.deviceid = XIAllMasterDevices;
-        Status result = XISelectEvents(xDisplay, window, &mask, 1);
-        // If we select for touch events on the master pointer, XInput2
-        // will not synthesize mouse events. This means Qt must do it,
-        // which is also preferable, since Qt can control better when
-        // to do so.
-        if (m_xi2Minor >= 2 && result == Success)
-            has_touch_without_mouse_emulation = true;
+    if (isUsingXInput22()) {
+        bitMask |= XI_TouchBeginMask;
+        bitMask |= XI_TouchUpdateMask;
+        bitMask |= XI_TouchEndMask;
+        XIEventMask mask;
+        mask.mask_len = sizeof(bitMask);
+        mask.mask = xiBitMask;
+        if (!m_touchDevices.isEmpty()) {
+            mask.deviceid = XIAllMasterDevices;
+            Status result = XISelectEvents(xDisplay, window, &mask, 1);
+            // If we select for touch events on the master pointer, XInput2
+            // will not synthesize mouse events. This means Qt must do it,
+            // which is also preferable, since Qt can control better when
+            // to do so.
+            if (result == Success)
+                has_touch_without_mouse_emulation = true;
+        }
     }
 #endif // XCB_USE_XINPUT22