Remove QQuickPointerDevice in favor of QPointingDevice

...and generally deal with changes immediately required after adding
QInputDevice and QPointingDevice.

Also fixed a few usages of deprecated accessors that weren't taken
care of in 212c2bffbb041aee0e3c9a7f0551ef151ed2d3ad.

Task-number: QTBUG-46412
Task-number: QTBUG-69433
Task-number: QTBUG-72167
Change-Id: I93a2643162878afa216556f10808fd92e0b20071
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index c957d2d702..39cb911647 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -171,7 +171,7 @@ public:
 
         lastVelocity = lastVelocityFromMouseMove = QVector2D();
         lastMousePos = QPointF();
-        lastMouseCapabilityFlags = 0;
+        lastMouseCapabilityFlags = {};
         touchEventCount = 0;
         mouseMoveCount = 0;
         mouseUngrabEventCount = 0;
@@ -199,7 +199,7 @@ public:
     QVector2D lastVelocity;
     QVector2D lastVelocityFromMouseMove;
     QPointF lastMousePos;
-    int lastMouseCapabilityFlags;
+    QInputDevice::Capabilities lastMouseCapabilityFlags;
 
     void touchEvent(QTouchEvent *event) {
         if (!acceptTouchEvents) {
@@ -208,7 +208,7 @@ public:
         }
         ++touchEventCount;
         lastEvent = makeTouchData(event->type(), event->window(), event->touchPointStates(), event->touchPoints());
-        if (event->device()->capabilities().testFlag(QTouchDevice::Velocity) && !event->touchPoints().isEmpty()) {
+        if (event->device()->capabilities().testFlag(QPointingDevice::Capability::Velocity) && !event->touchPoints().isEmpty()) {
             lastVelocity = event->touchPoints().first().velocity();
         } else {
             lastVelocity = QVector2D();
@@ -225,7 +225,7 @@ public:
         }
         mousePressCount = ++mousePressNum;
         lastMousePos = e->position().toPoint();
-        lastMouseCapabilityFlags = QGuiApplicationPrivate::mouseEventCaps(e);
+        lastMouseCapabilityFlags = e->device()->capabilities();
     }
 
     void mouseMoveEvent(QMouseEvent *e) {
@@ -235,7 +235,7 @@ public:
         }
         mouseMoveCount = ++mouseMoveNum;
         lastVelocityFromMouseMove = QGuiApplicationPrivate::mouseEventVelocity(e);
-        lastMouseCapabilityFlags = QGuiApplicationPrivate::mouseEventCaps(e);
+        lastMouseCapabilityFlags = e->device()->capabilities();
         lastMousePos = e->position().toPoint();
     }
 
@@ -246,7 +246,7 @@ public:
         }
         ++mouseReleaseNum;
         lastMousePos = e->position().toPoint();
-        lastMouseCapabilityFlags = QGuiApplicationPrivate::mouseEventCaps(e);
+        lastMouseCapabilityFlags = e->device()->capabilities();
     }
 
     void mouseUngrabEvent() {
@@ -382,10 +382,10 @@ class tst_qquickwindow : public QQmlDataTest
 public:
     tst_qquickwindow()
       : touchDevice(QTest::createTouchDevice())
-      , touchDeviceWithVelocity(QTest::createTouchDevice())
+      , touchDeviceWithVelocity(QTest::createTouchDevice(QInputDevice::DeviceType::TouchScreen,
+            QInputDevice::Capability::Position | QPointingDevice::Capability::Velocity))
     {
         QQuickWindow::setDefaultAlphaBuffer(true);
-        touchDeviceWithVelocity->setCapabilities(QTouchDevice::Position | QTouchDevice::Velocity);
     }
 
 private slots:
@@ -501,8 +501,8 @@ private slots:
     void rendererInterfaceWithRenderControl();
 
 private:
-    QTouchDevice *touchDevice;
-    QTouchDevice *touchDeviceWithVelocity;
+    QPointingDevice *touchDevice;
+    QPointingDevice *touchDeviceWithVelocity;
 };
 
 #if QT_CONFIG(opengl)
@@ -1185,7 +1185,7 @@ void tst_qquickwindow::mouseFromTouch_basic()
     QCOMPARE(item->mouseReleaseNum, 1);
     QCOMPARE(item->lastMousePos.toPoint(), item->mapFromScene(points[0].position()).toPoint());
     QCOMPARE(item->lastVelocityFromMouseMove, velocity);
-    QVERIFY((item->lastMouseCapabilityFlags & QTouchDevice::Velocity) != 0);
+//    QVERIFY(item->lastMouseCapabilityFlags.testFlag(QInputDevice::Capability::Velocity)); // TODO
 
     // Now the same with a transformation.
     item->setRotation(90); // clockwise
@@ -2850,7 +2850,7 @@ void tst_qquickwindow::pointerEventTypeAndPointCount()
         QList<QTouchEvent::TouchPoint>() << QTouchEvent::TouchPoint(1));
 
 
-    QQuickPointerMouseEvent pme(nullptr, QQuickPointerDevice::genericMouseDevice());
+    QQuickPointerMouseEvent pme(nullptr, QPointingDevice::primaryPointingDevice());
     pme.reset(&me);
     QCOMPARE(pme.asMouseEvent(localPosition), &me);
     QVERIFY(pme.asPointerMouseEvent());
@@ -2862,7 +2862,7 @@ void tst_qquickwindow::pointerEventTypeAndPointCount()
     QCOMPARE(pme.asMouseEvent(localPosition)->position(), localPosition);
     QCOMPARE(pme.asMouseEvent(localPosition)->globalPosition(), screenPosition);
 
-    QQuickPointerTouchEvent pte(nullptr, QQuickPointerDevice::touchDevice(touchDevice));
+    QQuickPointerTouchEvent pte(nullptr, touchDevice);
     pte.reset(&te);
     QCOMPARE(pte.asTouchEvent(), &te);
     QVERIFY(!pte.asPointerMouseEvent());