Adapt to recent qtbase changes and update dependencies

 - moving linuxaccessibility/xkbcommon/eglsupport/glxsupport to QtGui
 - event refactoring

Task-number: QTBUG-83255
Change-Id: Ic82ee6ef5652413781468edb58c601ee7dce2e3b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

2 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/client/seatv5/tst_seatv5.cpp b/tests/auto/client/seatv5/tst_seatv5.cpp
index a4d4fe4d..701c5ede 100644
--- a/tests/auto/client/seatv5/tst_seatv5.cpp
+++ b/tests/auto/client/seatv5/tst_seatv5.cpp
@@ -398,7 +398,7 @@ public:
         {
         }
         QEvent::Type type{};
-        Qt::TouchPointStates touchPointStates{};
+        QEventPoint::States touchPointStates{};
         QList<QTouchEvent::TouchPoint> touchPoints;
     };
     QList<Event> m_events;
diff --git a/tests/auto/client/tabletv2/tst_tabletv2.cpp b/tests/auto/client/tabletv2/tst_tabletv2.cpp
index f52db64f..3e68e5d1 100644
--- a/tests/auto/client/tabletv2/tst_tabletv2.cpp
+++ b/tests/auto/client/tabletv2/tst_tabletv2.cpp
@@ -465,11 +465,11 @@ protected:
         case QEvent::TabletEnterProximity:
         case QEvent::TabletLeaveProximity: {
             auto *e = static_cast<QTabletEvent *>(event);
-            auto *ev = new QTabletEvent(e->type(), e->position(), e->globalPosition(), int(e->deviceType()),
-                                        int(e->pointerType()), e->pressure(), e->xTilt(), e->yTilt(),
-                                        e->tangentialPressure(), e->rotation(), e->z(),
-                                        Qt::KeyboardModifier::NoModifier, e->uniqueId(),
-                                        e->button(), e->buttons());
+            auto *ev = new QTabletEvent(e->type(), e->pointingDevice(), e->position(), e->globalPosition(),
+                                     e->pressure(), e->xTilt(), e->yTilt(),
+                                     e->tangentialPressure(), e->rotation(), e->z(),
+                                     Qt::KeyboardModifier::NoModifier,
+                                     e->button(), e->buttons());
             m_events << ev;
             break;
         }
@@ -600,11 +600,11 @@ public:
 
     void tabletEvent(QTabletEvent *e) override
     {
-        m_events << new QTabletEvent(e->type(), e->position(), e->globalPosition(), int(e->deviceType()),
-                                     int(e->pointerType()), e->pressure(), e->xTilt(), e->yTilt(),
+        m_events << new QTabletEvent(e->type(), e->pointingDevice(), e->position(), e->globalPosition(),
+                                     e->pressure(), e->xTilt(), e->yTilt(),
                                      e->tangentialPressure(), e->rotation(), e->z(),
-                                     Qt::KeyboardModifier::NoModifier, e->uniqueId(), e->button(),
-                                     e->buttons());
+                                     Qt::KeyboardModifier::NoModifier,
+                                     e->button(), e->buttons());
         emit tabletEventReceived(m_events.last());
     }
     int nextEventIndex = 0;