whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build without feature.tabletevent 

Change-Id: I13950e184453318671e4cac6dac844e76771f430
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Tasuku Suzuki 2017-01-13 17:29:17 +09:00
parent 6292ecdf6d
commit 21306bccc4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platformsupport/input/input.pro
View File

@ -11,7 +11,9 @@ qtConfig(evdev) {
include($$PWD/evdevmouse/evdevmouse.pri)
include($$PWD/evdevkeyboard/evdevkeyboard.pri)
include($$PWD/evdevtouch/evdevtouch.pri)
include($$PWD/evdevtablet/evdevtablet.pri)
qtConfig(tabletevent) {
include($$PWD/evdevtablet/evdevtablet.pri)
}
}
qtConfig(tslib) {

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

@ -1032,6 +1032,7 @@ bool QXcbConnection::isTouchScreen(int id) const
&& device->qtTouchDevice->type() == QTouchDevice::TouchScreen;
}
#if QT_CONFIG(tabletevent)
static QTabletEvent::TabletDevice toolIdToTabletDevice(quint32 toolId) {
// keep in sync with wacom_intuos_inout() in Linux kernel driver wacom_wac.c
switch (toolId) {
@ -1065,7 +1066,6 @@ static QTabletEvent::TabletDevice toolIdToTabletDevice(quint32 toolId) {
return QTabletEvent::Stylus; // Safe default assumption if nonzero
}
#ifndef QT_NO_TABLETEVENT
bool QXcbConnection::xi2HandleTabletEvent(const void *event, TabletData *tabletData)
{
bool handled = true;