Commit 172bf301 authored by Halla Rempt's avatar Halla Rempt

make build with qt 4.6

parent 2a12eb1d
......@@ -19,7 +19,9 @@
#include <input/wintab/qt_x11_p_qt47.h>
#else
#if QT_VERSION >= 0x040600
#include <input/wintab/qt_x11_p_qt46.h>
#define QT_NO_XIM
#include <input/wintab/qt_x11_p_qt46.h>
#undef QT_NO_XIM
#endif
#endif
#endif
......
......@@ -98,15 +98,27 @@ void kis_x11_init_tablet()
#if defined(Q_OS_IRIX)
#else
if (devs->type == ATOM(XWacomStylus) || devs->type == ATOM(XTabletStylus)) {
deviceType = QTabletEvent::Stylus;
if (wacomDeviceName()->isEmpty())
wacomDeviceName()->append(devs->name);
gotStylus = true;
} else if (devs->type == ATOM(XWacomEraser) || devs->type == ATOM(XTabletEraser)) {
deviceType = QTabletEvent::XFreeEraser;
gotEraser = true;
}
#if QT_VERSION >= 0x040700
if (devs->type == ATOM(XWacomStylus) || devs->type == ATOM(XTabletStylus)) {
#else
if (devs->type == ATOM(XWacomStylus)) {
#endif
deviceType = QTabletEvent::Stylus;
if (wacomDeviceName()->isEmpty())
wacomDeviceName()->append(devs->name);
gotStylus = true;
#if QT_VERSION >= 0x040700
} else if (devs->type == ATOM(XWacomEraser) || devs->type == ATOM(XTabletEraser)) {
#else
} else if (devs->type == ATOM(XWacomEraser)) {
#endif
deviceType = QTabletEvent::XFreeEraser;
gotEraser = true;
}
#endif
if (deviceType == QTabletEvent::NoDevice)
continue;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment