1 files changed, 11 insertions, 11 deletions

diff --git a/src/client/qwaylandtabletv2.cpp b/src/client/qwaylandtabletv2.cpp
index eb2e865f6..0f55aba9e 100644
--- a/src/client/qwaylandtabletv2.cpp
+++ b/src/client/qwaylandtabletv2.cpp
@@ -137,35 +137,35 @@ void QWaylandTabletToolV2::zwp_tablet_tool_v2_done()
     case type::type_brush:
     case type::type_pencil:
     case type::type_pen:
-        m_pointerType = QTabletEvent::PointerType::Pen;
+        m_pointerType = QPointingDevice::PointerType::Pen;
         break;
     case type::type_eraser:
-        m_pointerType = QTabletEvent::PointerType::Eraser;
+        m_pointerType = QPointingDevice::PointerType::Eraser;
         break;
     case type::type_mouse:
     case type::type_lens:
-        m_pointerType = QTabletEvent::PointerType::Cursor;
+        m_pointerType = QPointingDevice::PointerType::Cursor;
         break;
     case type::type_finger:
-        m_pointerType = QTabletEvent::PointerType::UnknownPointer;
+        m_pointerType = QPointingDevice::PointerType::Unknown;
         break;
     }
     switch (m_toolType) {
     case type::type_airbrush:
-        m_tabletDevice = QTabletEvent::TabletDevice::Airbrush;
+        m_tabletDevice = QInputDevice::DeviceType::Airbrush;
         break;
     case type::type_brush:
     case type::type_pencil:
     case type::type_pen:
     case type::type_eraser:
-        m_tabletDevice = m_hasRotation ? QTabletEvent::TabletDevice::RotationStylus : QTabletEvent::TabletDevice::Stylus;
+        m_tabletDevice = QInputDevice::DeviceType::Stylus;
         break;
     case type::type_lens:
-        m_tabletDevice = QTabletEvent::TabletDevice::Puck;
+        m_tabletDevice = QInputDevice::DeviceType::Puck;
         break;
     case type::type_mouse:
     case type::type_finger:
-        m_tabletDevice = QTabletEvent::TabletDevice::NoDevice;
+        m_tabletDevice = QInputDevice::DeviceType::Unknown;
         break;
     }
 }
@@ -261,7 +261,7 @@ void QWaylandTabletToolV2::zwp_tablet_tool_v2_button(uint32_t serial, uint32_t b
 void QWaylandTabletToolV2::zwp_tablet_tool_v2_frame(uint32_t time)
 {
     if (m_pending.proximitySurface && !m_applied.proximitySurface) {
-        QWindowSystemInterface::handleTabletEnterProximityEvent(m_tabletDevice, m_pointerType, m_uid);
+        QWindowSystemInterface::handleTabletEnterProximityEvent(int(m_tabletDevice), int(m_pointerType), m_uid);
         m_applied.proximitySurface = m_pending.proximitySurface;
     }
 
@@ -288,12 +288,12 @@ void QWaylandTabletToolV2::zwp_tablet_tool_v2_frame(uint32_t time)
         qreal rotation = m_pending.rotation;
         int z = int(m_pending.distance);
         QWindowSystemInterface::handleTabletEvent(window, timestamp, localPosition, globalPosition,
-                                                  m_tabletDevice, m_pointerType, buttons, pressure,
+                                                  int(m_tabletDevice), int(m_pointerType), buttons, pressure,
                                                   xTilt, yTilt, tangentialPressure, rotation, z, m_uid);
     }
 
     if (!m_pending.proximitySurface && m_applied.enteredSurface) {
-        QWindowSystemInterface::handleTabletLeaveProximityEvent(m_tabletDevice, m_pointerType, m_uid);
+        QWindowSystemInterface::handleTabletLeaveProximityEvent(int(m_tabletDevice), int(m_pointerType), m_uid);
         m_pending = State(); // Don't leave pressure etc. lying around when we enter the next surface
     }