1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing #ifdef for isTouchScreen() implementation

Browse Source 
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>
This commit is contained in:
Andy Shaw 2017-08-17 06:21:08 +02:00
parent ab323c5bf4
commit d293f071f5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
View File

@ -1028,12 +1028,14 @@ Qt::MouseButton QXcbConnection::xiToQtMouseButton(uint32_t b)
return Qt::NoButton; return Qt::NoButton;
} }
#ifdef XCB_USE_XINPUT22
bool QXcbConnection::isTouchScreen(int id) const bool QXcbConnection::isTouchScreen(int id) const
{ {
auto device = m_touchDevices.value(id); auto device = m_touchDevices.value(id);
return device && device->qtTouchDevice return device && device->qtTouchDevice
&& device->qtTouchDevice->type() == QTouchDevice::TouchScreen; && device->qtTouchDevice->type() == QTouchDevice::TouchScreen;
} }
#endif
#if QT_CONFIG(tabletevent) #if QT_CONFIG(tabletevent)
static QTabletEvent::TabletDevice toolIdToTabletDevice(quint32 toolId) { static QTabletEvent::TabletDevice toolIdToTabletDevice(quint32 toolId) {