From cfe4e8b8dc994ed84d4bbb6c52ae1b33336bc3d9 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Wed, 13 Jul 2016 14:42:47 +0200
Subject: [PATCH] tst_qquickwindow: make use of new QTest::createTouchDevice
 function

So gui-private API isn't necessary anymore.
Same as change 94324bd93fe9f4f61346b8f9e934c01279cb700e

Task-number: QTBUG-44030
Change-Id: I780cc1eedf9285336b96219a1fb1cd4016512701
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 tests/auto/quick/qquickwindow/qquickwindow.pro    |  2 +-
 .../auto/quick/qquickwindow/tst_qquickwindow.cpp  | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/tests/auto/quick/qquickwindow/qquickwindow.pro b/tests/auto/quick/qquickwindow/qquickwindow.pro
index f0d287f30f..05093ba8e0 100644
--- a/tests/auto/quick/qquickwindow/qquickwindow.pro
+++ b/tests/auto/quick/qquickwindow/qquickwindow.pro
@@ -7,7 +7,7 @@ include(../shared/util.pri)
 
 macx:CONFIG -= app_bundle
 
-QT += core-private gui-private qml-private quick-private  testlib
+QT += core-private qml-private quick-private  testlib
 
 TESTDATA = data/*
 
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 0985198d65..329bbbed60 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -40,7 +40,6 @@
 #include "../shared/visualtestutil.h"
 #include "../shared/viewtestutil.h"
 #include <QSignalSpy>
-#include <qpa/qwindowsysteminterface.h>
 #include <private/qquickwindow_p.h>
 #include <private/qguiapplication_p.h>
 #include <QRunnable>
@@ -275,22 +274,14 @@ class tst_qquickwindow : public QQmlDataTest
     Q_OBJECT
 public:
     tst_qquickwindow()
+      : touchDevice(QTest::createTouchDevice())
+      , touchDeviceWithVelocity(QTest::createTouchDevice())
     {
         QQuickWindow::setDefaultAlphaBuffer(true);
+        touchDeviceWithVelocity->setCapabilities(QTouchDevice::Position | QTouchDevice::Velocity);
     }
 
 private slots:
-    void initTestCase()
-    {
-        QQmlDataTest::initTestCase();
-        touchDevice = new QTouchDevice;
-        touchDevice->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(touchDevice);
-        touchDeviceWithVelocity = new QTouchDevice;
-        touchDeviceWithVelocity->setType(QTouchDevice::TouchScreen);
-        touchDeviceWithVelocity->setCapabilities(QTouchDevice::Position | QTouchDevice::Velocity);
-        QWindowSystemInterface::registerTouchDevice(touchDeviceWithVelocity);
-    }
     void cleanup();
 #ifndef QT_NO_OPENGL
     void openglContextCreatedSignal();