Remove copy of tests/shared/util.h.

This module has a copy of qtbase's tests/shared/util.h, the contents of
which have been moved into qtestlib and are now accessible from the
QtTest/QtTest header.

Change-Id: I0be9e21dc9f30629dad283a740b9d80347e01140
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

78 files changed, 3 insertions, 156 deletions

diff --git a/tests/auto/declarative/debugger/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/debugger/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index 55a49c7bc2..1587eee060 100644
--- a/tests/auto/declarative/debugger/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/debugger/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -47,7 +47,6 @@
 
 #include <QtDeclarative/qdeclarativeengine.h>
 
-#include "../../../../shared/util.h"
 #include "../shared/debugutil_p.h"
 
 #define PORT 13770
diff --git a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 91e06cec8a..8f829a6468 100644
--- a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -50,7 +50,6 @@
 #include <private/qdeclarativedebugclient_p.h>
 #include <private/qdeclarativedebugservice_p.h>
 
-#include "../../../../shared/util.h"
 #include "../../shared/util.h"
 #include "../shared/debugutil_p.h"
 
diff --git a/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp
index 7ef2ee1649..8e31303aa4 100644
--- a/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp
+++ b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp
@@ -58,7 +58,6 @@
 #include <private/qdeclarativemetatype_p.h>
 #include <private/qdeclarativeproperty_p.h>
 
-#include "../../../../shared/util.h"
 #include "../shared/debugutil_p.h"
 
 Q_DECLARE_METATYPE(QDeclarativeDebugWatch::State)
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index 81aac51393..9d3f41563d 100644
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qtest.h>
+#include <QtTest/QtTest>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qsgview.h>
@@ -55,7 +55,6 @@
 #include <math.h>
 
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_qdeclarativeanimations : public QObject
 {
diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
index 6c0d354362..184a7df195 100644
--- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
+++ b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qsgitem.h>
diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
index 8eb29073c6..b2aa311434 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
+++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qtest.h>
+#include <QtTest/QtTest>
 #include <qsignalspy.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
@@ -49,7 +49,6 @@
 #include <private/qdeclarativeanimation_p.h>
 #include <private/qsgitem_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_qdeclarativebehaviors : public QObject
 {
diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
index 92b3c2b72c..de34d9e009 100644
--- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
+++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
@@ -44,7 +44,6 @@
 #include <private/qdeclarativebind_p.h>
 #include <private/qsgrectangle_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_qdeclarativebinding : public QObject
 {
diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
index 78beee6f59..f3354ac5db 100644
--- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
+++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
@@ -48,7 +48,6 @@
 #include <QtDeclarative/qdeclarativeincubator.h>
 #include <qcolor.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class MyIC : public QObject, public QDeclarativeIncubationController
 {
diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
index 31c0db6eb2..ec04833548 100644
--- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
+++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -44,7 +44,6 @@
 #include <private/qdeclarativeconnections_p.h>
 #include <private/qsgitem_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativescriptstring.h>
 
 class tst_qdeclarativeconnection : public QObject
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 4f1cdccc04..40072c9e60 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qtest.h>
+#include <QtTest/QtTest>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativeexpression.h>
@@ -54,7 +54,6 @@
 #include "testtypes.h"
 #include "testhttpserver.h"
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 /*
 This test covers evaluation of ECMAScript expressions and bindings from within
diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
index f80928f4b8..f8c91e6000 100644
--- a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QtTest/QSignalSpy>
-#include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtCore/qdir.h>
diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
index cd67f14667..67a040dcf2 100644
--- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
+++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -45,7 +45,6 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtDeclarative/private/qdeclarativefontloader_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include "../../declarative/shared/testhttpserver.h"
 
 #define SERVER_PORT 14448
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index 817738ad8a..9f4e131cbd 100644
--- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -45,7 +45,6 @@
 #include <private/qsgimage_p.h>
 #include <QImageReader>
 #include <QWaitCondition>
-#include "../../../shared/util.h"
 
 Q_DECLARE_METATYPE(QDeclarativeImageProvider*);
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index a06be0250b..bde2c14fd9 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -52,8 +52,6 @@
 #include <private/qdeclarativeglobal_p.h>
 
 #include "testtypes.h"
-
-#include "../../../shared/util.h"
 #include "testhttpserver.h"
 
 DEFINE_BOOL_CONFIG_OPTION(qmlCheckTypes, QML_CHECK_TYPES)
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index fe2cf9cf63..92e3a8f58d 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -51,8 +51,6 @@
 #include <QtCore/qtranslator.h>
 #include <QSignalSpy>
 
-#include "../../../shared/util.h"
-
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<QVariantHash>)
 
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index 4ac625ef62..d8b7cf4e5b 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -45,7 +45,6 @@
 #include <QDebug>
 
 #include "../shared/testhttpserver.h"
-#include "../../../shared/util.h"
 #include "../shared/util.h"
 
 #define SERVER_ADDR "http://127.0.0.1:14450"
diff --git a/tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp b/tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp
index c390b7b672..91513fc8a5 100644
--- a/tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp
+++ b/tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp
@@ -45,7 +45,6 @@
 #include <QtDeclarative/private/qdeclarativepath_p.h>
 
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_QDeclarativePath : public QObject
 {
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index e0f7a66566..386d465982 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -45,7 +45,6 @@
 #include <QtDeclarative/qdeclarativeimageprovider.h>
 #include <QNetworkReply>
 #include "testhttpserver.h"
-#include "../../../shared/util.h"
 
 #ifndef QT_NO_CONCURRENT
 #include <qtconcurrentrun.h>
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
index 17a4f0e071..989edfab8b 100644
--- a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
+++ b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
@@ -45,7 +45,6 @@
 #include <private/qsgrectangle_p.h>
 #include <private/qdeclarativevaluetype_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_qdeclarativesmoothedanimation : public QObject
 {
diff --git a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
index 2432509bd2..d7edcee386 100644
--- a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
+++ b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
@@ -44,7 +44,6 @@
 #include <private/qdeclarativespringanimation_p.h>
 #include <private/qdeclarativevaluetype_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_qdeclarativespringanimation : public QObject
 {
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
index 0527427910..b7e04b7e70 100644
--- a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
+++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <private/qsgtext_p.h>
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index cbf4814725..ac24a0b6c5 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -51,7 +51,6 @@
 #include <private/qsgitem_p.h>
 #include <private/qdeclarativeproperty_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class MyAttached : public QObject
 {
diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
index 15251ecf15..8c9543273c 100644
--- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
+++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
@@ -45,7 +45,6 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/private/qdeclarativesystempalette_p.h>
 #include <qpalette.h>
-#include "../../../shared/util.h"
 
 class tst_qdeclarativesystempalette : public QObject
 {
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
index 8b7f6b6054..bb7921c8e3 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
+++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
@@ -51,7 +51,6 @@
 #include <private/qdeclarativeworkerscript_p.h>
 #include <private/qdeclarativeengine_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 inline QUrl TEST_FILE(const QString &filename)
 {
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
index a035b4e870..1caec581cc 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
@@ -46,7 +46,6 @@
 #include <QNetworkCookieJar>
 #include "testhttpserver.h"
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 #define SERVER_PORT 14445
 
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index 3328232236..2b66e67024 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -57,7 +57,6 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <private/qdeclarativexmllistmodel_p.h>
-#include "../../../shared/util.h"
 
 typedef QPair<int, int> QDeclarativeXmlListRange;
 typedef QList<QVariantList> QDeclarativeXmlModelData;
diff --git a/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp b/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp
index 8e63773104..757270177e 100644
--- a/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp
+++ b/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp
@@ -50,7 +50,6 @@
 
 #include "../shared/testhttpserver.h"
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_qsganimatedimage : public QObject
 {
diff --git a/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp b/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp
index a96ea4b68a..0835a66dd7 100644
--- a/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp
+++ b/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp
@@ -57,7 +57,6 @@
 
 #include "../shared/testhttpserver.h"
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 #define SERVER_PORT 14446
 #define SERVER_ADDR "http://127.0.0.1:14446"
diff --git a/tests/auto/declarative/qsgcanvas/tst_qsgcanvas.cpp b/tests/auto/declarative/qsgcanvas/tst_qsgcanvas.cpp
index a504de87a5..d8135ed233 100644
--- a/tests/auto/declarative/qsgcanvas/tst_qsgcanvas.cpp
+++ b/tests/auto/declarative/qsgcanvas/tst_qsgcanvas.cpp
@@ -45,7 +45,6 @@
 #include <QtDeclarative/QSGItem>
 #include <QtDeclarative/QSGCanvas>
 #include <QtDeclarative/private/qsgrectangle_p.h>
-#include "../../../shared/util.h"
 #include <QtGui/QWindowSystemInterface>
 
 struct TouchEventData {
diff --git a/tests/auto/declarative/qsgdrag/tst_qsgdrag.cpp b/tests/auto/declarative/qsgdrag/tst_qsgdrag.cpp
index 8e2163a3eb..9719114662 100644
--- a/tests/auto/declarative/qsgdrag/tst_qsgdrag.cpp
+++ b/tests/auto/declarative/qsgdrag/tst_qsgdrag.cpp
@@ -46,7 +46,6 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativeexpression.h>
-#include "../../../shared/util.h"
 
 template <typename T> static T evaluate(QObject *scope, const QString &expression)
 {
diff --git a/tests/auto/declarative/qsgdroparea/tst_qsgdroparea.cpp b/tests/auto/declarative/qsgdroparea/tst_qsgdroparea.cpp
index 57cedcc414..1c303b4b3e 100644
--- a/tests/auto/declarative/qsgdroparea/tst_qsgdroparea.cpp
+++ b/tests/auto/declarative/qsgdroparea/tst_qsgdroparea.cpp
@@ -46,7 +46,6 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativeexpression.h>
-#include "../../../shared/util.h"
 
 #include <QtGui/qwindowsysteminterface_qpa.h>
 
diff --git a/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp b/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
index 0920f0f65c..fa3f13fea9 100644
--- a/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
+++ b/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
@@ -47,7 +47,6 @@
 #include <private/qdeclarativevaluetype_p.h>
 #include <math.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include <QtOpenGL/QGLShaderProgram>
 
 class tst_qsgflickable : public QObject
diff --git a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
index 046bacab6d..c70ba69f36 100644
--- a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
+++ b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
@@ -48,7 +48,6 @@
 #include <private/qsgtext_p.h>
 #include <QtDeclarative/private/qsgfocusscope_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_qsgfocusscope : public QObject
 {
diff --git a/tests/auto/declarative/qsggridview/tst_qsggridview.cpp b/tests/auto/declarative/qsggridview/tst_qsggridview.cpp
index b5cd75cc7f..9e5c425632 100644
--- a/tests/auto/declarative/qsggridview/tst_qsggridview.cpp
+++ b/tests/auto/declarative/qsggridview/tst_qsggridview.cpp
@@ -52,7 +52,6 @@
 #include <QtDeclarative/private/qsgtext_p.h>
 #include <QtDeclarative/private/qdeclarativelistmodel_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include <QtGui/qguiapplication.h>
 
 Q_DECLARE_METATYPE(Qt::LayoutDirection)
diff --git a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp
index 7a850db7a8..84d5f75539 100644
--- a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp
+++ b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp
@@ -57,7 +57,6 @@
 #include <QtGui/QImageReader>
 
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include "../shared/testhttpserver.h"
 
 #define SERVER_PORT 14451
diff --git a/tests/auto/declarative/qsgitem/tst_qsgitem.cpp b/tests/auto/declarative/qsgitem/tst_qsgitem.cpp
index c914d31783..84c52bdde8 100644
--- a/tests/auto/declarative/qsgitem/tst_qsgitem.cpp
+++ b/tests/auto/declarative/qsgitem/tst_qsgitem.cpp
@@ -45,7 +45,6 @@
 #include "qsgcanvas.h"
 #include <QtWidgets/QGraphicsSceneMouseEvent>
 #include "private/qsgfocusscope_p.h"
-#include "../../../shared/util.h"
 #include <QDebug>
 #include <QTimer>
 
diff --git a/tests/auto/declarative/qsgitem2/tst_qsgitem.cpp b/tests/auto/declarative/qsgitem2/tst_qsgitem.cpp
index 08a3071e51..fe29de1aad 100644
--- a/tests/auto/declarative/qsgitem2/tst_qsgitem.cpp
+++ b/tests/auto/declarative/qsgitem2/tst_qsgitem.cpp
@@ -47,7 +47,6 @@
 #include <private/qsgrectangle_p.h>
 #include <private/qsgitem_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_QSGItem : public QObject
 {
diff --git a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
index c2a6920b48..a23d3b592c 100644
--- a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
+++ b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
@@ -53,7 +53,6 @@
 #include <QtDeclarative/private/qlistmodelinterface_p.h>
 #include <QtDeclarative/private/qdeclarativechangeset_p.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include "incrementalmodel.h"
 #include <math.h>
 
diff --git a/tests/auto/declarative/qsgloader/tst_qsgloader.cpp b/tests/auto/declarative/qsgloader/tst_qsgloader.cpp
index 7f307e01bd..3968a92ac0 100644
--- a/tests/auto/declarative/qsgloader/tst_qsgloader.cpp
+++ b/tests/auto/declarative/qsgloader/tst_qsgloader.cpp
@@ -48,7 +48,6 @@
 #include <private/qsgloader_p.h>
 #include "testhttpserver.h"
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 #define SERVER_PORT 14450
 
diff --git a/tests/auto/declarative/qsgmousearea/tst_qsgmousearea.cpp b/tests/auto/declarative/qsgmousearea/tst_qsgmousearea.cpp
index 0ac2fa9829..be6a6017f0 100644
--- a/tests/auto/declarative/qsgmousearea/tst_qsgmousearea.cpp
+++ b/tests/auto/declarative/qsgmousearea/tst_qsgmousearea.cpp
@@ -49,7 +49,6 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtOpenGL/QGLShaderProgram>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 //#define OLDWAY
 
diff --git a/tests/auto/declarative/qsgpathview/tst_qsgpathview.cpp b/tests/auto/declarative/qsgpathview/tst_qsgpathview.cpp
index c4648603cb..c6440cf5ef 100644
--- a/tests/auto/declarative/qsgpathview/tst_qsgpathview.cpp
+++ b/tests/auto/declarative/qsgpathview/tst_qsgpathview.cpp
@@ -57,7 +57,6 @@
 #include <QFile>
 
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 static void initStandardTreeModel(QStandardItemModel *model)
 {
diff --git a/tests/auto/declarative/qsgpositioners/tst_qsgpositioners.cpp b/tests/auto/declarative/qsgpositioners/tst_qsgpositioners.cpp
index 0ef10c1eb3..03dc18763c 100644
--- a/tests/auto/declarative/qsgpositioners/tst_qsgpositioners.cpp
+++ b/tests/auto/declarative/qsgpositioners/tst_qsgpositioners.cpp
@@ -48,7 +48,6 @@
 #include <private/qsgitem_p.h>
 #include <qdeclarativeexpression.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 
 class tst_qsgpositioners : public QObject
 {
diff --git a/tests/auto/declarative/qsgtext/tst_qsgtext.cpp b/tests/auto/declarative/qsgtext/tst_qsgtext.cpp
index 8dc32b2cc0..ae3140e266 100644
--- a/tests/auto/declarative/qsgtext/tst_qsgtext.cpp
+++ b/tests/auto/declarative/qsgtext/tst_qsgtext.cpp
@@ -54,7 +54,6 @@
 #include <limits.h>
 #include <QtGui/QMouseEvent>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include "testhttpserver.h"
 
 DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
diff --git a/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp b/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
index 945b2d2c45..17ce4db6cb 100644
--- a/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
+++ b/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QtTest/QSignalSpy>
-#include "../../../shared/util.h"
 #include "../shared/testhttpserver.h"
 #include <math.h>
 #include <QFile>
diff --git a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
index 9ab6e69ba1..67089d8de5 100644
--- a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
+++ b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
@@ -41,7 +41,6 @@
 #include <qtest.h>
 #include <QtTest/QSignalSpy>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QFile>
 #include <QtDeclarative/qsgview.h>
diff --git a/tests/auto/declarative/qsgview/tst_qsgview.cpp b/tests/auto/declarative/qsgview/tst_qsgview.cpp
index 5edf1976a5..d2c51d60e9 100644
--- a/tests/auto/declarative/qsgview/tst_qsgview.cpp
+++ b/tests/auto/declarative/qsgview/tst_qsgview.cpp
@@ -45,7 +45,6 @@
 #include <QtDeclarative/qsgview.h>
 #include <QtDeclarative/qsgitem.h>
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include <QtGui/QWindow>
 #include <QtCore/QDebug>
 
diff --git a/tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp b/tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp
index d9fec3f8b3..019493109d 100644
--- a/tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp
+++ b/tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 #include "../shared/util.h"
-#include "../../../shared/util.h"
 #include <qtest.h>
 #include <QtTest/QSignalSpy>
 #include <QStandardItemModel>
diff --git a/tests/auto/particles/qsgage/tst_qsgage.cpp b/tests/auto/particles/qsgage/tst_qsgage.cpp
index 54591e7349..faa267560b 100644
--- a/tests/auto/particles/qsgage/tst_qsgage.cpp
+++ b/tests/auto/particles/qsgage/tst_qsgage.cpp
@@ -42,7 +42,6 @@
 #include <QtTest/QtTest>
 #include "../shared/particlestestsshared.h"
 #include <private/qsgparticlesystem_p.h>
-#include "../../../shared/util.h"
 #include <private/qabstractanimation_p.h>
 
 class tst_qsgage : public QObject
diff --git a/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
index 09d198047b..275b8d0fb4 100644
--- a/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
+++ b/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
@@ -49,7 +49,6 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 
 #include "../../declarative/shared/testhttpserver.h"
-#include "../../../shared/util.h"
 
 class tst_qdeclarativeanimatedimage : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index b523b09e05..7075be8f98 100644
--- a/tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -48,8 +48,6 @@
 #include <QVariantAnimation>
 #include <QEasingCurve>
 
-#include "../../../shared/util.h"
-
 class tst_qdeclarativeanimations : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
index 14765e41db..be4dc5f0c0 100644
--- a/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
+++ b/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtQuick1/qdeclarativeitem.h>
diff --git a/tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
index 3cff254510..7e2f8343eb 100644
--- a/tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
+++ b/tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
@@ -48,7 +48,6 @@
 #include <QtQuick1/private/qdeclarativebehavior_p.h>
 #include <QtQuick1/private/qdeclarativeanimation_p.h>
 #include <QtQuick1/private/qdeclarativeitem_p.h>
-#include "../../../shared/util.h"
 
 class tst_qdeclarativebehaviors : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/qtquick1/qdeclarativebinding/tst_qdeclarativebinding.cpp
index 9516aeb0e1..d476748da5 100644
--- a/tests/auto/qtquick1/qdeclarativebinding/tst_qdeclarativebinding.cpp
+++ b/tests/auto/qtquick1/qdeclarativebinding/tst_qdeclarativebinding.cpp
@@ -43,7 +43,6 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtQuick1/private/qdeclarativebind_p.h>
 #include <QtQuick1/private/qdeclarativerectangle_p.h>
-#include "../../../shared/util.h"
 
 class tst_qdeclarativebinding : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
index b2a84e8f1b..4b82fe0a4e 100644
--- a/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
+++ b/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
@@ -55,7 +55,6 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 
 #include "../../declarative/shared/testhttpserver.h"
-#include "../../../shared/util.h"
 
 #define SERVER_PORT 14446
 #define SERVER_ADDR "http://127.0.0.1:14446"
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/qtquick1/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
index f23d5bc3ae..588090af31 100644
--- a/tests/auto/qtquick1/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
+++ b/tests/auto/qtquick1/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -43,7 +43,6 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtQuick1/private/qdeclarativeconnections_p.h>
 #include <QtQuick1/private/qdeclarativeitem_p.h>
-#include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativescriptstring.h>
 
 class tst_qdeclarativeconnection : public QObject
diff --git a/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index 8e7f9ca218..3962102641 100644
--- a/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -47,7 +47,6 @@
 #include <private/qdeclarativevaluetype_p.h>
 #include <QtWidgets/qgraphicswidget.h>
 #include <math.h>
-#include "../../../shared/util.h"
 
 class tst_qdeclarativeflickable : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/qtquick1/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
index 656a095248..0102782b14 100644
--- a/tests/auto/qtquick1/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
+++ b/tests/auto/qtquick1/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
@@ -47,7 +47,6 @@
 #include <QtQuick1/private/qdeclarativetextedit_p.h>
 #include <QtQuick1/private/qdeclarativetext_p.h>
 #include <QtQuick1/private/qdeclarativefocusscope_p.h>
-#include "../../../shared/util.h"
 
 class tst_qdeclarativefocusscope : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
index 12ca221475..3bcbe1b67c 100644
--- a/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
+++ b/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -44,7 +44,6 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtQuick1/private/qdeclarativefontloader_p.h>
-#include "../../../shared/util.h"
 #include "../../declarative/shared/testhttpserver.h"
 
 #define SERVER_PORT 14448
diff --git a/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp
index ea5cc2e3e2..4a332320f1 100644
--- a/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -49,7 +49,6 @@
 #include <QtQuick1/private/qdeclarativeitem_p.h>
 #include <QtQuick1/private/qdeclarativegridview_p.h>
 #include <QtQuick1/private/qdeclarativetext_p.h>
-#include "../../../shared/util.h"
 
 class tst_QDeclarative1GridView : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp
index fdfbbb1b07..e93c373bf1 100644
--- a/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -54,7 +54,6 @@
 #include <QtDeclarative/qdeclarativeexpression.h>
 #include <QtTest/QSignalSpy>
 
-#include "../../../shared/util.h"
 #include "../../declarative/shared/testhttpserver.h"
 
 #define SERVER_PORT 14451
diff --git a/tests/auto/qtquick1/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/qtquick1/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index 91c61f0884..21e41333af 100644
--- a/tests/auto/qtquick1/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
+++ b/tests/auto/qtquick1/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -45,7 +45,6 @@
 #include <QtQuick1/private/qdeclarativeimage_p.h>
 #include <QImageReader>
 #include <QWaitCondition>
-#include "../../../shared/util.h"
 
 Q_DECLARE_METATYPE(QDeclarativeImageProvider*);
 
diff --git a/tests/auto/qtquick1/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/qtquick1/qdeclarativeitem/tst_qdeclarativeitem.cpp
index ea84051a73..0998573b5b 100644
--- a/tests/auto/qtquick1/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/qtquick1/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -46,7 +46,6 @@
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtQuick1/private/qdeclarativerectangle_p.h>
 #include <QtQuick1/private/qdeclarativeitem_p.h>
-#include "../../../shared/util.h"
 
 class tst_QDeclarativeItem : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp b/tests/auto/qtquick1/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
index 8ea61dc69e..c3a0b2267a 100644
--- a/tests/auto/qtquick1/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
+++ b/tests/auto/qtquick1/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
@@ -47,7 +47,6 @@
 #include <qgraphicsscene.h>
 #include <qgraphicswidget.h>
 #include <qgraphicslinearlayout.h>
-#include "../../../shared/util.h"
 
 class tst_qdeclarativelayoutitem : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/qtquick1/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 4b3d3a66fe..945a2134d1 100644
--- a/tests/auto/qtquick1/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/qtquick1/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -51,8 +51,6 @@
 #include <QtCore/qtranslator.h>
 #include <QSignalSpy>
 
-#include "../../../shared/util.h"
-
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<QVariantHash>)
 
diff --git a/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
index 5d1eb39a6e..835623f53c 100644
--- a/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -50,7 +50,6 @@
 #include <QtQuick1/private/qdeclarativetext_p.h>
 #include <QtQuick1/private/qdeclarativevisualitemmodel_p.h>
 #include <QtDeclarative/private/qlistmodelinterface_p.h>
-#include "../../../shared/util.h"
 #include "incrementalmodel.h"
 
 class tst_QDeclarative1ListView : public QObject
diff --git a/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp
index f23ce3fdbb..665f2b5521 100644
--- a/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -47,7 +47,6 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtQuick1/private/qdeclarativeloader_p.h>
 #include "testhttpserver.h"
-#include "../../../shared/util.h"
 
 #define SERVER_PORT 14450
 
diff --git a/tests/auto/qtquick1/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/qtquick1/qdeclarativepathview/tst_qdeclarativepathview.cpp
index 69c8956fc5..d4e5378289 100644
--- a/tests/auto/qtquick1/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/qtquick1/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -55,8 +55,6 @@
 #include <QStandardItemModel>
 #include <QFile>
 
-#include "../../../shared/util.h"
-
 static void initStandardTreeModel(QStandardItemModel *model)
 {
     QStandardItem *item;
diff --git a/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 28a3c6912a..35bd4fba5a 100644
--- a/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -47,7 +47,6 @@
 #include <QtQuick1/private/qdeclarativeitem_p.h>
 #include <qdeclarativeexpression.h>
 #include <QtWidgets/qgraphicswidget.h>
-#include "../../../shared/util.h"
 
 class tst_QDeclarativePositioners : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/qtquick1/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
index 1d1a8110b3..7ddcc43dc9 100644
--- a/tests/auto/qtquick1/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
+++ b/tests/auto/qtquick1/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
@@ -44,7 +44,6 @@
 #include <QtQuick1/private/qdeclarativesmoothedanimation_p.h>
 #include <QtQuick1/private/qdeclarativerectangle_p.h>
 #include <private/qdeclarativevaluetype_p.h>
-#include "../../../shared/util.h"
 
 class tst_qdeclarativesmoothedanimation : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp b/tests/auto/qtquick1/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
index 51137fabdf..5a7bea6664 100644
--- a/tests/auto/qtquick1/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
+++ b/tests/auto/qtquick1/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
@@ -43,7 +43,6 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtQuick1/private/qdeclarativespringanimation_p.h>
 #include <private/qdeclarativevaluetype_p.h>
-#include "../../../shared/util.h"
 
 class tst_qdeclarativespringanimation : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/qtquick1/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
index 47381601a8..22805be64f 100644
--- a/tests/auto/qtquick1/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
+++ b/tests/auto/qtquick1/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
@@ -45,7 +45,6 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtQuick1/private/qdeclarativesystempalette_p.h>
 #include <qpalette.h>
-#include "../../../shared/util.h"
 
 class tst_qdeclarativesystempalette : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp
index cefc7a2740..42a7fe1404 100644
--- a/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -52,7 +52,6 @@
 #include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h>
 #include <limits.h>
 
-#include "../../../shared/util.h"
 #include "testhttpserver.h"
 
 class tst_qdeclarativetext : public QObject
diff --git a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 45402f1aa4..2289762c54 100644
--- a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QtTest/QSignalSpy>
-#include "../../../shared/util.h"
 #include "../../declarative/shared/testhttpserver.h"
 #include <math.h>
 #include <QFile>
diff --git a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 76aa040046..fde2a49a5c 100644
--- a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QtTest/QSignalSpy>
-#include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QFile>
 #include <QtQuick1/qdeclarativeview.h>
diff --git a/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp
index 019810ad56..b2dfc8e8f6 100644
--- a/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp
+++ b/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp
@@ -45,7 +45,6 @@
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtQuick1/qdeclarativeitem.h>
 #include <QtWidgets/qgraphicswidget.h>
-#include "../../../shared/util.h"
 
 class tst_QDeclarativeView : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
index 6db8b4fbfb..3ab836be40 100644
--- a/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
+++ b/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
@@ -46,10 +46,8 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtWidgets/qmenubar.h>
 #include <QSignalSpy>
-#include "../../../shared/util.h"
 #include "qmlruntime.h"
 #include "deviceorientation.h"
-#include "../../../shared/util.h"
 
 #if defined(Q_OS_MAC) || defined(Q_WS_MAEMO_5)
 #  define MENUBAR_HEIGHT(mw) 0
diff --git a/tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index 021d389612..4a219dbe6d 100644
--- a/tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
+++ b/tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -56,7 +56,6 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtQuick1/private/qdeclarativexmllistmodel_p.h>
-#include "../../../shared/util.h"
 
 typedef QPair<int, int> QDeclarativeXmlListRange;
 typedef QList<QVariantList> QDeclarativeXmlModelData;
diff --git a/tests/shared/util.h b/tests/shared/util.h
deleted file mode 100644
index ac78f2dfec..0000000000
--- a/tests/shared/util.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-// Functions and macros that really need to be in QTestLib
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_VERIFY(__expr) \
-    do { \
-        const int __step = 50; \
-        const int __timeout = 5000; \
-        if (!(__expr)) { \
-            QTest::qWait(0); \
-        } \
-        for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
-            QTest::qWait(__step); \
-        } \
-        QVERIFY(__expr); \
-    } while(0)
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_COMPARE(__expr, __expected) \
-    do { \
-        const int __step = 50; \
-        const int __timeout = 5000; \
-        if ((__expr) != (__expected)) { \
-            QTest::qWait(0); \
-        } \
-        for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
-            QTest::qWait(__step); \
-        } \
-        QCOMPARE(__expr, __expected); \
-    } while(0)
-