From d293f071f5b5c4bdafa4bfcf55c778d09bf9661d Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 17 Aug 2017 06:21:08 +0200 Subject: [PATCH] Add missing #ifdef for isTouchScreen() implementation The definition of isTouchScreen() is protected with XCB_USE_XINPUT22 so the implementation needs to have this too. Task-number: QTBUG-62226 Change-Id: Icc3de01a6cb1299b43e56fc9f77833764131ca4b Reviewed-by: Gatis Paeglis --- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp index 38ea2d9ab92..6f20ec25e3c 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp @@ -1028,12 +1028,14 @@ Qt::MouseButton QXcbConnection::xiToQtMouseButton(uint32_t b) return Qt::NoButton; } +#ifdef XCB_USE_XINPUT22 bool QXcbConnection::isTouchScreen(int id) const { auto device = m_touchDevices.value(id); return device && device->qtTouchDevice && device->qtTouchDevice->type() == QTouchDevice::TouchScreen; } +#endif #if QT_CONFIG(tabletevent) static QTabletEvent::TabletDevice toolIdToTabletDevice(quint32 toolId) {