autotests: use QTest::createTouchDevice()

Task-number: QTBUG-44030
Change-Id: I514c1294a0ff6587b825982a8bb354104c214120
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

10 files changed, 57 insertions, 108 deletions

diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index 74fd64bf59..e6fd67e3a8 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -213,11 +213,10 @@ private:
     QTouchDevice *touchPadDevice;
 };
 
-tst_QTouchEvent::tst_QTouchEvent() : touchScreenDevice(new QTouchDevice), touchPadDevice(new QTouchDevice)
+tst_QTouchEvent::tst_QTouchEvent()
+  : touchScreenDevice(QTest::createTouchDevice())
+  , touchPadDevice(QTest::createTouchDevice(QTouchDevice::TouchPad))
 {
-    touchPadDevice->setType(QTouchDevice::TouchPad);
-    QWindowSystemInterface::registerTouchDevice(touchScreenDevice);
-    QWindowSystemInterface::registerTouchDevice(touchPadDevice);
 }
 
 void tst_QTouchEvent::cleanup()
@@ -1490,10 +1489,6 @@ bool WindowTouchEventFilter::eventFilter(QObject *, QEvent *event)
 
 void tst_QTouchEvent::testQGuiAppDelivery()
 {
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
-
     QWindow w;
     w.setGeometry(100, 100, 100, 100);
     w.show();
@@ -1521,38 +1516,33 @@ void tst_QTouchEvent::testQGuiAppDelivery()
     QCOMPARE(filter.d.isEmpty(), true);
 
     // Now the real thing.
-    QWindowSystemInterface::handleTouchEvent(&w, device, points); // TouchBegin
+    QWindowSystemInterface::handleTouchEvent(&w, touchScreenDevice, points); // TouchBegin
     QCoreApplication::processEvents();
     QCOMPARE(filter.d.count(), 1);
-    QCOMPARE(filter.d.contains(device), true);
-    QCOMPARE(filter.d.value(device).points.count(), 1);
-    QCOMPARE(filter.d.value(device).lastSeenType, QEvent::TouchBegin);
+    QCOMPARE(filter.d.contains(touchScreenDevice), true);
+    QCOMPARE(filter.d.value(touchScreenDevice).points.count(), 1);
+    QCOMPARE(filter.d.value(touchScreenDevice).lastSeenType, QEvent::TouchBegin);
 
     points[0].state = Qt::TouchPointMoved;
-    QWindowSystemInterface::handleTouchEvent(&w, device, points); // TouchUpdate
+    QWindowSystemInterface::handleTouchEvent(&w, touchScreenDevice, points); // TouchUpdate
     QCoreApplication::processEvents();
     QCOMPARE(filter.d.count(), 1);
-    QCOMPARE(filter.d.contains(device), true);
-    QCOMPARE(filter.d.value(device).points.count(), 2);
-    QCOMPARE(filter.d.value(device).lastSeenType, QEvent::TouchUpdate);
+    QCOMPARE(filter.d.contains(touchScreenDevice), true);
+    QCOMPARE(filter.d.value(touchScreenDevice).points.count(), 2);
+    QCOMPARE(filter.d.value(touchScreenDevice).lastSeenType, QEvent::TouchUpdate);
 
     points[0].state = Qt::TouchPointReleased;
-    QWindowSystemInterface::handleTouchEvent(&w, device, points); // TouchEnd
+    QWindowSystemInterface::handleTouchEvent(&w, touchScreenDevice, points); // TouchEnd
     QCoreApplication::processEvents();
     QCOMPARE(filter.d.count(), 1);
-    QCOMPARE(filter.d.contains(device), true);
-    QCOMPARE(filter.d.value(device).points.count(), 3);
-    QCOMPARE(filter.d.value(device).lastSeenType, QEvent::TouchEnd);
+    QCOMPARE(filter.d.contains(touchScreenDevice), true);
+    QCOMPARE(filter.d.value(touchScreenDevice).points.count(), 3);
+    QCOMPARE(filter.d.value(touchScreenDevice).lastSeenType, QEvent::TouchEnd);
 }
 
 void tst_QTouchEvent::testMultiDevice()
 {
-    QTouchDevice *deviceOne = new QTouchDevice;
-    deviceOne->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(deviceOne);
-    QTouchDevice *deviceTwo = new QTouchDevice;
-    deviceTwo->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(deviceTwo);
+    QTouchDevice *deviceTwo = QTest::createTouchDevice();
 
     QWindow w;
     w.setGeometry(100, 100, 100, 100);
@@ -1564,7 +1554,7 @@ void tst_QTouchEvent::testMultiDevice()
 
     QList<QWindowSystemInterface::TouchPoint> pointsOne, pointsTwo;
 
-    // deviceOne reports a single point, deviceTwo reports the beginning of a multi-point sequence.
+    // touchScreenDevice reports a single point, deviceTwo reports the beginning of a multi-point sequence.
     // Even though there is a point with id 0 for both devices, they should be delivered cleanly, independently.
     QWindowSystemInterface::TouchPoint tp;
     tp.id = 0;
@@ -1580,20 +1570,20 @@ void tst_QTouchEvent::testMultiDevice()
     tp.area = QHighDpi::toNative(area1, QHighDpiScaling::factor(&w), screenOrigin);
     pointsTwo.append(tp);
 
-    QWindowSystemInterface::handleTouchEvent(&w, deviceOne, pointsOne);
+    QWindowSystemInterface::handleTouchEvent(&w, touchScreenDevice, pointsOne);
     QWindowSystemInterface::handleTouchEvent(&w, deviceTwo, pointsTwo);
     QCoreApplication::processEvents();
 
-    QCOMPARE(filter.d.contains(deviceOne), true);
+    QCOMPARE(filter.d.contains(touchScreenDevice), true);
     QCOMPARE(filter.d.contains(deviceTwo), true);
 
-    QCOMPARE(filter.d.value(deviceOne).lastSeenType, QEvent::TouchBegin);
+    QCOMPARE(filter.d.value(touchScreenDevice).lastSeenType, QEvent::TouchBegin);
     QCOMPARE(filter.d.value(deviceTwo).lastSeenType, QEvent::TouchBegin);
-    QCOMPARE(filter.d.value(deviceOne).points.count(), 1);
+    QCOMPARE(filter.d.value(touchScreenDevice).points.count(), 1);
     QCOMPARE(filter.d.value(deviceTwo).points.count(), 2);
 
-    QCOMPARE(filter.d.value(deviceOne).points.at(0).screenRect(), QRectF(area0));
-    QCOMPARE(filter.d.value(deviceOne).points.at(0).state(), pointsOne[0].state);
+    QCOMPARE(filter.d.value(touchScreenDevice).points.at(0).screenRect(), QRectF(area0));
+    QCOMPARE(filter.d.value(touchScreenDevice).points.at(0).state(), pointsOne[0].state);
 
     QCOMPARE(filter.d.value(deviceTwo).points.at(0).screenRect(), QRectF(area0));
     QCOMPARE(filter.d.value(deviceTwo).points.at(0).state(), pointsTwo[0].state);
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 1756dab70a..4d4565f02e 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -105,7 +105,7 @@ private slots:
 private:
     QPoint m_availableTopLeft;
     QSize m_testWindowSize;
-    QTouchDevice *touchDevice;
+    QTouchDevice *touchDevice = QTest::createTouchDevice();
 };
 
 void tst_QWindow::initTestCase()
@@ -119,9 +119,6 @@ void tst_QWindow::initTestCase()
     if (screenWidth > 2000)
         width = 100 * ((screenWidth + 500) / 1000);
     m_testWindowSize = QSize(width, width);
-    touchDevice = new QTouchDevice;
-    touchDevice->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(touchDevice);
 }
 
 void tst_QWindow::cleanup()
diff --git a/tests/auto/other/gestures/gestures.pro b/tests/auto/other/gestures/gestures.pro
index 3d0ef7c745..0ec0435f62 100644
--- a/tests/auto/other/gestures/gestures.pro
+++ b/tests/auto/other/gestures/gestures.pro
@@ -1,4 +1,4 @@
 CONFIG += testcase
 TARGET = tst_gestures
-QT += widgets testlib gui-private
+QT += widgets testlib
 SOURCES  += tst_gestures.cpp
diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp
index 59b285b032..d153146574 100644
--- a/tests/auto/other/gestures/tst_gestures.cpp
+++ b/tests/auto/other/gestures/tst_gestures.cpp
@@ -40,7 +40,6 @@
 #include <qgraphicswidget.h>
 #include <qgraphicsview.h>
 #include <qmainwindow.h>
-#include <qpa/qwindowsysteminterface.h>
 
 #include <qdebug.h>
 
@@ -2318,9 +2317,7 @@ void tst_Gestures::bug_13501_gesture_not_accepted()
     w.show();
     QVERIFY(waitForWindowExposed(&w));
     //QTest::mousePress(&ignoreEvent, Qt::LeftButton);
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
+    QTouchDevice *device = QTest::createTouchDevice();
     QTest::touchEvent(&w, device).press(0, QPoint(10, 10), &w);
 }
 
diff --git a/tests/auto/widgets/gestures/qgesturerecognizer/tst_qgesturerecognizer.cpp b/tests/auto/widgets/gestures/qgesturerecognizer/tst_qgesturerecognizer.cpp
index 6b0c1ecf57..c3ebb838bb 100644
--- a/tests/auto/widgets/gestures/qgesturerecognizer/tst_qgesturerecognizer.cpp
+++ b/tests/auto/widgets/gestures/qgesturerecognizer/tst_qgesturerecognizer.cpp
@@ -38,8 +38,6 @@
 #include <QtCore/QHash>
 #include <QtCore/QDebug>
 
-#include <qpa/qwindowsysteminterface.h>
-
 class tst_QGestureRecognizer : public QObject
 {
     Q_OBJECT
@@ -64,15 +62,13 @@ private:
 
 tst_QGestureRecognizer::tst_QGestureRecognizer()
     : m_fingerDistance(qRound(QGuiApplication::primaryScreen()->physicalDotsPerInch() / 2.0))
-    , m_touchDevice(new QTouchDevice)
+    , m_touchDevice(QTest::createTouchDevice())
 {
     qputenv("QT_PAN_TOUCHPOINTS", "2"); // Prevent device detection of pan touch point count.
 }
 
 void tst_QGestureRecognizer::initTestCase()
 {
-    m_touchDevice->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(m_touchDevice);
 }
 
 #ifndef QT_NO_GESTURES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index c1fe012683..46d0b18990 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -11017,9 +11017,7 @@ void tst_QGraphicsItem::touchEventPropagation()
     touchPoints << tp;
 
     sendMousePress(&scene, tp.scenePos());
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
+    QTouchDevice *device = QTest::createTouchDevice();
     QTouchEvent touchBegin(QEvent::TouchBegin, device, Qt::NoModifier, Qt::TouchPointPressed, touchPoints);
 
     qApp->sendEvent(&scene, &touchBegin);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 8908b83f11..a3aa90168a 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -3797,9 +3797,7 @@ void tst_QGraphicsProxyWidget::forwardTouchEvent()
 
     EventSpy eventSpy(widget);
 
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
+    QTouchDevice *device = QTest::createTouchDevice();
 
     QCOMPARE(eventSpy.counts[QEvent::TouchBegin], 0);
     QCOMPARE(eventSpy.counts[QEvent::TouchUpdate], 0);
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index f942f78b1d..eda51e31a9 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -1934,9 +1934,7 @@ void tst_QApplication::touchEventPropagation()
     release.setState(Qt::TouchPointReleased);
     releasedTouchPoints << release;
 
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
+    QTouchDevice *device = QTest::createTouchDevice();
 
     {
         // touch event behavior on a window
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 78fbae768a..3253d09bb8 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -415,6 +415,7 @@ private:
     QPoint m_availableTopLeft;
     QPoint m_safeCursorPos;
     const bool m_windowsAnimationsEnabled;
+    QTouchDevice *m_touchScreen;
 };
 
 bool tst_QWidget::ensureScreenSize(int width, int height)
@@ -573,6 +574,7 @@ tst_QWidget::tst_QWidget()
     : m_platform(QGuiApplication::platformName().toLower())
     , m_safeCursorPos(0, 0)
     , m_windowsAnimationsEnabled(windowsAnimationsEnabled())
+    , m_touchScreen(QTest::createTouchDevice())
 {
     if (m_windowsAnimationsEnabled) // Disable animations which can interfere with screen grabbing in moveChild(), showAndMoveChild()
         setWindowsAnimationsEnabled(false);
@@ -9712,25 +9714,21 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
 
     {
         // Simple case, we ignore the touch events, we get mouse events instead
-        QTouchDevice *device = new QTouchDevice;
-        device->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(device);
-
         TouchMouseWidget widget;
         widget.show();
         QVERIFY(QTest::qWaitForWindowExposed(widget.windowHandle()));
         QCOMPARE(widget.m_touchEventCount, 0);
         QCOMPARE(widget.m_mouseEventCount, 0);
 
-        QTest::touchEvent(&widget, device).press(0, QPoint(10, 10), &widget);
+        QTest::touchEvent(&widget, m_touchScreen).press(0, QPoint(10, 10), &widget);
         QCOMPARE(widget.m_touchEventCount, 0);
         QCOMPARE(widget.m_mouseEventCount, 1);
         QCOMPARE(widget.m_lastMouseEventPos, QPointF(10, 10));
-        QTest::touchEvent(&widget, device).move(0, QPoint(15, 15), &widget);
+        QTest::touchEvent(&widget, m_touchScreen).move(0, QPoint(15, 15), &widget);
         QCOMPARE(widget.m_touchEventCount, 0);
         QCOMPARE(widget.m_mouseEventCount, 2);
         QCOMPARE(widget.m_lastMouseEventPos, QPointF(15, 15));
-        QTest::touchEvent(&widget, device).release(0, QPoint(20, 20), &widget);
+        QTest::touchEvent(&widget, m_touchScreen).release(0, QPoint(20, 20), &widget);
         QCOMPARE(widget.m_touchEventCount, 0);
         QCOMPARE(widget.m_mouseEventCount, 4); // we receive extra mouse move event
         QCOMPARE(widget.m_lastMouseEventPos, QPointF(20, 20));
@@ -9738,10 +9736,6 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
 
     {
         // We accept the touch events, no mouse event is generated
-        QTouchDevice *device = new QTouchDevice;
-        device->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(device);
-
         TouchMouseWidget widget;
         widget.setAcceptTouch(true);
         widget.show();
@@ -9749,13 +9743,13 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
         QCOMPARE(widget.m_touchEventCount, 0);
         QCOMPARE(widget.m_mouseEventCount, 0);
 
-        QTest::touchEvent(&widget, device).press(0, QPoint(10, 10), &widget);
+        QTest::touchEvent(&widget, m_touchScreen).press(0, QPoint(10, 10), &widget);
         QCOMPARE(widget.m_touchEventCount, 1);
         QCOMPARE(widget.m_mouseEventCount, 0);
-        QTest::touchEvent(&widget, device).move(0, QPoint(15, 15), &widget);
+        QTest::touchEvent(&widget, m_touchScreen).move(0, QPoint(15, 15), &widget);
         QCOMPARE(widget.m_touchEventCount, 2);
         QCOMPARE(widget.m_mouseEventCount, 0);
-        QTest::touchEvent(&widget, device).release(0, QPoint(20, 20), &widget);
+        QTest::touchEvent(&widget, m_touchScreen).release(0, QPoint(20, 20), &widget);
         QCOMPARE(widget.m_touchEventCount, 3);
         QCOMPARE(widget.m_mouseEventCount, 0);
     }
@@ -9763,10 +9757,6 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
     {
         // Parent accepts touch events, child ignore both mouse and touch
         // We should see propagation of the TouchBegin
-        QTouchDevice *device = new QTouchDevice;
-        device->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(device);
-
         TouchMouseWidget parent;
         parent.setAcceptTouch(true);
         TouchMouseWidget child(&parent);
@@ -9779,7 +9769,7 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
         QCOMPARE(child.m_touchEventCount, 0);
         QCOMPARE(child.m_mouseEventCount, 0);
 
-        QTest::touchEvent(parent.window(), device).press(0, QPoint(10, 10), &child);
+        QTest::touchEvent(parent.window(), m_touchScreen).press(0, QPoint(10, 10), &child);
         QCOMPARE(parent.m_touchEventCount, 1);
         QCOMPARE(parent.m_mouseEventCount, 0);
         QCOMPARE(child.m_touchEventCount, 0);
@@ -9789,10 +9779,6 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
     {
         // Parent accepts mouse events, child ignore both mouse and touch
         // We should see propagation of the TouchBegin into a MouseButtonPress
-        QTouchDevice *device = new QTouchDevice;
-        device->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(device);
-
         TouchMouseWidget parent;
         TouchMouseWidget child(&parent);
         child.move(5, 5);
@@ -9804,7 +9790,7 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
         QCOMPARE(child.m_touchEventCount, 0);
         QCOMPARE(child.m_mouseEventCount, 0);
 
-        QTest::touchEvent(parent.window(), device).press(0, QPoint(10, 10), &child);
+        QTest::touchEvent(parent.window(), m_touchScreen).press(0, QPoint(10, 10), &child);
         QCOMPARE(parent.m_touchEventCount, 0);
         QCOMPARE(parent.m_mouseEventCount, 1);
         QCOMPARE(parent.m_lastMouseEventPos, QPointF(15, 15));
@@ -9816,10 +9802,6 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
 
 void tst_QWidget::touchUpdateOnNewTouch()
 {
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
-
     TouchMouseWidget widget;
     widget.setAcceptTouch(true);
     QVBoxLayout *layout = new QVBoxLayout;
@@ -9832,23 +9814,23 @@ void tst_QWidget::touchUpdateOnNewTouch()
     QCOMPARE(widget.m_touchBeginCount, 0);
     QCOMPARE(widget.m_touchUpdateCount, 0);
     QCOMPARE(widget.m_touchEndCount, 0);
-    QTest::touchEvent(window, device).press(0, QPoint(20, 20), window);
+    QTest::touchEvent(window, m_touchScreen).press(0, QPoint(20, 20), window);
     QCOMPARE(widget.m_touchBeginCount, 1);
     QCOMPARE(widget.m_touchUpdateCount, 0);
     QCOMPARE(widget.m_touchEndCount, 0);
-    QTest::touchEvent(window, device).move(0, QPoint(25, 25), window);
+    QTest::touchEvent(window, m_touchScreen).move(0, QPoint(25, 25), window);
     QCOMPARE(widget.m_touchBeginCount, 1);
     QCOMPARE(widget.m_touchUpdateCount, 1);
     QCOMPARE(widget.m_touchEndCount, 0);
-    QTest::touchEvent(window, device).stationary(0).press(1, QPoint(40, 40), window);
+    QTest::touchEvent(window, m_touchScreen).stationary(0).press(1, QPoint(40, 40), window);
     QCOMPARE(widget.m_touchBeginCount, 1);
     QCOMPARE(widget.m_touchUpdateCount, 2);
     QCOMPARE(widget.m_touchEndCount, 0);
-    QTest::touchEvent(window, device).stationary(1).release(0, QPoint(25, 25), window);
+    QTest::touchEvent(window, m_touchScreen).stationary(1).release(0, QPoint(25, 25), window);
     QCOMPARE(widget.m_touchBeginCount, 1);
     QCOMPARE(widget.m_touchUpdateCount, 3);
     QCOMPARE(widget.m_touchEndCount, 0);
-    QTest::touchEvent(window, device).release(1, QPoint(40, 40), window);
+    QTest::touchEvent(window, m_touchScreen).release(1, QPoint(40, 40), window);
     QCOMPARE(widget.m_touchBeginCount, 1);
     QCOMPARE(widget.m_touchUpdateCount, 3);
     QCOMPARE(widget.m_touchEndCount, 1);
@@ -9856,10 +9838,6 @@ void tst_QWidget::touchUpdateOnNewTouch()
 
 void tst_QWidget::touchEventsForGesturePendingWidgets()
 {
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
-
     TouchMouseWidget parent;
     TouchMouseWidget child(&parent);
     parent.grabGesture(Qt::TapAndHoldGesture);
@@ -9872,14 +9850,14 @@ void tst_QWidget::touchEventsForGesturePendingWidgets()
     QCOMPARE(child.m_gestureEventCount, 0);
     QCOMPARE(parent.m_touchEventCount, 0);
     QCOMPARE(parent.m_gestureEventCount, 0);
-    QTest::touchEvent(window, device).press(0, QPoint(20, 20), window);
+    QTest::touchEvent(window, m_touchScreen).press(0, QPoint(20, 20), window);
     QCOMPARE(child.m_touchEventCount, 0);
     QCOMPARE(child.m_gestureEventCount, 0);
     QCOMPARE(parent.m_touchBeginCount, 1); // QTapAndHoldGestureRecognizer::create() sets Qt::WA_AcceptTouchEvents
     QCOMPARE(parent.m_touchUpdateCount, 0);
     QCOMPARE(parent.m_touchEndCount, 0);
     QCOMPARE(parent.m_gestureEventCount, 0);
-    QTest::touchEvent(window, device).move(0, QPoint(25, 25), window);
+    QTest::touchEvent(window, m_touchScreen).move(0, QPoint(25, 25), window);
     QCOMPARE(child.m_touchEventCount, 0);
     QCOMPARE(child.m_gestureEventCount, 0);
     QCOMPARE(parent.m_touchBeginCount, 1);
@@ -9887,7 +9865,7 @@ void tst_QWidget::touchEventsForGesturePendingWidgets()
     QCOMPARE(parent.m_touchEndCount, 0);
     QCOMPARE(parent.m_gestureEventCount, 0);
     QTest::qWait(1000);
-    QTest::touchEvent(window, device).release(0, QPoint(25, 25), window);
+    QTest::touchEvent(window, m_touchScreen).release(0, QPoint(25, 25), window);
     QCOMPARE(child.m_touchEventCount, 0);
     QCOMPARE(child.m_gestureEventCount, 0);
     QCOMPARE(parent.m_touchBeginCount, 1);
diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
index 2c398e1b2f..67bae43c9d 100644
--- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
+++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
@@ -125,6 +125,9 @@ private slots:
     void scrollTo();
     void scroll();
     void overshoot();
+
+private:
+    QTouchDevice *m_touchScreen = QTest::createTouchDevice();
 };
 
 /*! \internal
@@ -150,11 +153,8 @@ void tst_QScroller::kineticScroll( tst_QScrollerWidget *sw, QPointF from, QPoint
     touchPoint.setPos(touchStart);
     touchPoint.setScenePos(touchStart);
     touchPoint.setScreenPos(touchStart);
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
     QTouchEvent touchEvent1(QEvent::TouchBegin,
-                            device,
+                            m_touchScreen,
                             Qt::NoModifier,
                             Qt::TouchPointPressed,
                             (QList<QTouchEvent::TouchPoint>() << touchPoint));
@@ -168,7 +168,7 @@ void tst_QScroller::kineticScroll( tst_QScrollerWidget *sw, QPointF from, QPoint
     touchPoint.setScenePos(touchUpdate);
     touchPoint.setScreenPos(touchUpdate);
     QTouchEvent touchEvent2(QEvent::TouchUpdate,
-                            device,
+                            m_touchScreen,
                             Qt::NoModifier,
                             Qt::TouchPointMoved,
                             (QList<QTouchEvent::TouchPoint>() << touchPoint));
@@ -192,7 +192,7 @@ void tst_QScroller::kineticScroll( tst_QScrollerWidget *sw, QPointF from, QPoint
     touchPoint.setScenePos(touchEnd);
     touchPoint.setScreenPos(touchEnd);
     QTouchEvent touchEvent5(QEvent::TouchEnd,
-                            device,
+                            m_touchScreen,
                             Qt::NoModifier,
                             Qt::TouchPointReleased,
                             (QList<QTouchEvent::TouchPoint>() << touchPoint));
@@ -223,11 +223,8 @@ void tst_QScroller::kineticScrollNoTest( tst_QScrollerWidget *sw, QPointF from,
     touchPoint.setPos(touchStart);
     touchPoint.setScenePos(touchStart);
     touchPoint.setScreenPos(touchStart);
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
     QTouchEvent touchEvent1(QEvent::TouchBegin,
-                            device,
+                            m_touchScreen,
                             Qt::NoModifier,
                             Qt::TouchPointPressed,
                             (QList<QTouchEvent::TouchPoint>() << touchPoint));
@@ -239,7 +236,7 @@ void tst_QScroller::kineticScrollNoTest( tst_QScrollerWidget *sw, QPointF from,
     touchPoint.setScenePos(touchUpdate);
     touchPoint.setScreenPos(touchUpdate);
     QTouchEvent touchEvent2(QEvent::TouchUpdate,
-                            device,
+                            m_touchScreen,
                             Qt::NoModifier,
                             Qt::TouchPointMoved,
                             (QList<QTouchEvent::TouchPoint>() << touchPoint));
@@ -252,7 +249,7 @@ void tst_QScroller::kineticScrollNoTest( tst_QScrollerWidget *sw, QPointF from,
     touchPoint.setScenePos(touchEnd);
     touchPoint.setScreenPos(touchEnd);
     QTouchEvent touchEvent5(QEvent::TouchEnd,
-                            device,
+                            m_touchScreen,
                             Qt::NoModifier,
                             Qt::TouchPointReleased,
                             (QList<QTouchEvent::TouchPoint>() << touchPoint));