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, 2 insertions, 10 deletions

diff --git a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
index c18a220996..04a44a2c10 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
+++ b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
@@ -47,14 +47,6 @@ public:
     tst_QQuickMultiPointTouchArea() { }
 
 private slots:
-    void initTestCase() {
-        QQmlDataTest::initTestCase();
-        if (!device) {
-            device = new QTouchDevice;
-            device->setType(QTouchDevice::TouchScreen);
-            QWindowSystemInterface::registerTouchDevice(device);
-        }
-    }
     void cleanupTestCase() {}
 
     void properties();
@@ -80,7 +72,7 @@ private slots:
 
 private:
     QQuickView *createAndShowView(const QString &file);
-    QTouchDevice *device = nullptr;
+    QPointingDevice *device = QTest::createTouchDevice();
 };
 
 void tst_QQuickMultiPointTouchArea::properties()
@@ -838,7 +830,7 @@ void tst_QQuickMultiPointTouchArea::inFlickableWithPressDelay() // QTBUG-78818
     QTest::touchEvent(window.data(), device).press(0, p1);
     QQuickTouchUtils::flush(window.data());
     QTRY_COMPARE(point11->pressed(), true);
-    auto pointerEvent = windowPriv->pointerEventInstance(QQuickPointerDevice::touchDevices().at(0));
+    auto pointerEvent = windowPriv->pointerEventInstance(device);
     QCOMPARE(pointerEvent->point(0)->exclusiveGrabber(), mpta);
 
     // release: MPTA receives TouchEnd (which is asymmetric with mouse press); does NOT emit canceled.