make build with qt 4.6

krita/ui/input/wintab/config-qt_x11_p.h.cmake

@@ -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

krita/ui/input/wintab/kis_tablet_support_x11.cpp

@@ -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;