summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2017-08-17 06:21:08 +0200
committerAndy Shaw <andy.shaw@qt.io>2017-08-25 10:32:43 +0000
commitd293f071f5b5c4bdafa4bfcf55c778d09bf9661d (patch)
tree0c0191d78f72e70c9cc051554d45b81304f2fddb /src/plugins/platforms/xcb
parentab323c5bf488db20750407abd4cdb93b894803ce (diff)
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 <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb')
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_xi2.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index 38ea2d9ab9..6f20ec25e3 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) {