diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
| commit | dfc177e3a99dd593db4b1e9445d6243ce75ebf07 (patch) | |
| tree | 4e33c7be90a44642e672fff22ea163b500ff3aef /src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | |
| parent | 72efb2e6f4af2fd909daaf9104f09fd1425acfb0 (diff) | |
| parent | 1d6eb70dcec105af28d6a5e9b59d56c895c70389 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
qmake/library/qmakeevaluator.cpp
(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
src/corelib/kernel/qcore_mac_objc.mm
src/gui/painting/qcolor.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection_xi2.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp index 1147fc82b2..93f8db92bf 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp @@ -697,26 +697,7 @@ void QXcbConnection::xi2ProcessTouch(void *xiDevEvent, QXcbWindow *platformWindo if (m_xiGrab) { // XIAllowTouchEvents deadlocks with libXi < 1.7.4 (this has nothing to do with the XI2 versions like 2.2) // http://lists.x.org/archives/xorg-devel/2014-July/043059.html -#ifndef XCB_USE_XINPUT2 - static bool allowTouchWarningShown = false; - if (!allowTouchWarningShown) { - allowTouchWarningShown = true; - qWarning("Skipping XIAllowTouchEvents() because it was not possible to detect libXi version at build time." - " Minimum libXi version required is 1.7.4." - " Expect issues with touch behavior."); - } -#elif QT_LIBRARY_VERSION(xinput2) < QT_VERSION_CHECK(1, 7, 4) - static bool allowTouchWarningShown = false; - if (!allowTouchWarningShown) { - allowTouchWarningShown = true; - qWarning("Skipping XIAllowTouchEvents() due to not having libXi >= 1.7.4." - " libXi version at build time was %d.%d.%d." - " Expect issues with touch behavior.", - QT_LIBRARY_VERSION_MAJOR(xinput2), - QT_LIBRARY_VERSION_MINOR(xinput2), - QT_LIBRARY_VERSION_PATCH(xinput2)); - } -#else +#ifdef XCB_USE_XINPUT2 XIAllowTouchEvents(static_cast<Display *>(m_xlib_display), xiDeviceEvent->deviceid, xiDeviceEvent->detail, xiDeviceEvent->event, XIAcceptTouch); #endif |