Tests: Clean up inclusion of util.pri and debugutil.pri

When we include debugutil.pri, we always want util.pri, too. We can as
well nest the inclusions.

Also, setting the include path is much easier from within the .pri files
than from outside.

Change-Id: I1205bdc3051e16e635d4ea9626f44e51002ddb50
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

23 files changed, 4 insertions, 30 deletions

diff --git a/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro b/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro
index 6c729ab235..9cf323ba36 100644
--- a/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro
+++ b/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro
@@ -5,8 +5,6 @@ osx:CONFIG -= app_bundle
 
 SOURCES +=     tst_qdebugmessageservice.cpp
 
-INCLUDEPATH += ../shared
-include(../../../shared/util.pri)
 include(../shared/debugutil.pri)
 
 TESTDATA = data/*
diff --git a/tests/auto/qml/debugger/qpacketprotocol/qpacketprotocol.pro b/tests/auto/qml/debugger/qpacketprotocol/qpacketprotocol.pro
index a7c0fa7f8e..b1e3835844 100644
--- a/tests/auto/qml/debugger/qpacketprotocol/qpacketprotocol.pro
+++ b/tests/auto/qml/debugger/qpacketprotocol/qpacketprotocol.pro
@@ -4,7 +4,6 @@ osx:CONFIG -= app_bundle
 
 SOURCES += tst_qpacketprotocol.cpp
 
-INCLUDEPATH += ../shared
 include(../shared/debugutil.pri)
 
 QT += qml network testlib gui-private core-private
diff --git a/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro b/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro
index 622b373692..673330a3cf 100644
--- a/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro
+++ b/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro
@@ -7,7 +7,6 @@ HEADERS += ../shared/qqmldebugtestservice.h
 SOURCES += tst_qqmldebugclient.cpp \
            ../shared/qqmldebugtestservice.cpp
 
-INCLUDEPATH += ../shared
 include(../shared/debugutil.pri)
 
 DEFINES += QT_QML_DEBUG_NO_WARNING
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/qqmldebuggingenabler.pro b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/qqmldebuggingenabler.pro
index f8014f04f4..bd382ebaab 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/qqmldebuggingenabler.pro
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/qqmldebuggingenabler.pro
@@ -6,8 +6,6 @@ osx:CONFIG -= app_bundle
 
 SOURCES += tst_qqmldebuggingenabler.cpp
 
-INCLUDEPATH += ../../shared
-include(../../../../shared/util.pri)
 include(../../shared/debugutil.pri)
 
 OTHER_FILES += data/test.qml
diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/qqmldebugjs.pro b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/qqmldebugjs.pro
index cbaf3b5309..90623c75a6 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/qqmldebugjs.pro
+++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/qqmldebugjs.pro
@@ -6,8 +6,6 @@ osx:CONFIG -= app_bundle
 
 SOURCES +=     tst_qqmldebugjs.cpp
 
-INCLUDEPATH += ../../shared
-include(../../../../shared/util.pri)
 include(../../shared/debugutil.pri)
 include(../../shared/qqmlenginedebugclient.pri)
 
diff --git a/tests/auto/qml/debugger/qqmldebuglocal/qqmldebuglocal.pro b/tests/auto/qml/debugger/qqmldebuglocal/qqmldebuglocal.pro
index 860d39cca4..1dc9de8f34 100644
--- a/tests/auto/qml/debugger/qqmldebuglocal/qqmldebuglocal.pro
+++ b/tests/auto/qml/debugger/qqmldebuglocal/qqmldebuglocal.pro
@@ -7,7 +7,6 @@ HEADERS += ../shared/qqmldebugtestservice.h
 SOURCES += tst_qqmldebuglocal.cpp \
            ../shared/qqmldebugtestservice.cpp
 
-INCLUDEPATH += ../shared
 include(../shared/debugutil.pri)
 
 QT += qml-private testlib gui-private core-private
diff --git a/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro b/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro
index 79cbe52331..3101d09ea5 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro
+++ b/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro
@@ -7,8 +7,6 @@ HEADERS += ../shared/qqmldebugtestservice.h
 SOURCES += tst_qqmldebugservice.cpp \
            ../shared/qqmldebugtestservice.cpp
 
-INCLUDEPATH += ../shared
-include(../../../shared/util.pri)
 include(../shared/debugutil.pri)
 
 TESTDATA = data/*
diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/qqmlenginecontrol.pro b/tests/auto/qml/debugger/qqmlenginecontrol/qqmlenginecontrol.pro
index 40ec1230d6..34950a5569 100644
--- a/tests/auto/qml/debugger/qqmlenginecontrol/qqmlenginecontrol.pro
+++ b/tests/auto/qml/debugger/qqmlenginecontrol/qqmlenginecontrol.pro
@@ -4,8 +4,6 @@ osx:CONFIG -= app_bundle
 
 SOURCES += tst_qqmlenginecontrol.cpp
 
-INCLUDEPATH += ../shared
-include(../../../shared/util.pri)
 include(../shared/debugutil.pri)
 
 TESTDATA = data/*
diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/qqmlenginedebuginspectorintegrationtest.pro b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/qqmlenginedebuginspectorintegrationtest.pro
index b8b4c3fc8b..de3b38ec7a 100644
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/qqmlenginedebuginspectorintegrationtest.pro
+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/qqmlenginedebuginspectorintegrationtest.pro
@@ -6,8 +6,6 @@ osx:CONFIG -= app_bundle
 
 SOURCES += tst_qqmlenginedebuginspectorintegration.cpp
 
-INCLUDEPATH += ../shared
-include(../../../shared/util.pri)
 include(../shared/qqmlinspectorclient.pri)
 include(../shared/qqmlenginedebugclient.pri)
 include(../shared/debugutil.pri)
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro
index 06250d9940..33ee023c06 100644
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro
@@ -5,8 +5,6 @@ osx:CONFIG -= app_bundle
 SOURCES += \
     tst_qqmlenginedebugservice.cpp
 
-INCLUDEPATH += ../shared
-include(../../../shared/util.pri)
 include(../shared/qqmlenginedebugclient.pri)
 include(../shared/debugutil.pri)
 
diff --git a/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro b/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro
index ee5f3c708a..fd07255ae5 100644
--- a/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro
+++ b/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro
@@ -6,8 +6,6 @@ osx:CONFIG -= app_bundle
 
 SOURCES += tst_qqmlinspector.cpp
 
-INCLUDEPATH += ../shared
-include(../../../shared/util.pri)
 include(../shared/qqmlinspectorclient.pri)
 include(../shared/debugutil.pri)
 
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
index f5e3dbdc2f..8b8bdfe54b 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
@@ -4,8 +4,6 @@ osx:CONFIG -= app_bundle
 
 SOURCES += tst_qqmlprofilerservice.cpp
 
-INCLUDEPATH += ../shared
-include(../../../shared/util.pri)
 include(../shared/debugutil.pri)
 
 TESTDATA = data/*
diff --git a/tests/auto/qml/debugger/shared/debugutil.pri b/tests/auto/qml/debugger/shared/debugutil.pri
index 1983f3583e..44e8e0f999 100644
--- a/tests/auto/qml/debugger/shared/debugutil.pri
+++ b/tests/auto/qml/debugger/shared/debugutil.pri
@@ -1,4 +1,7 @@
 QT += qmldebug-private
 
+INCLUDEPATH += $$PWD
+include($$PWD/../../../shared/util.pri)
+
 HEADERS += $$PWD/debugutil_p.h
 SOURCES += $$PWD/debugutil.cpp
diff --git a/tests/auto/qml/qjsonbinding/qjsonbinding.pro b/tests/auto/qml/qjsonbinding/qjsonbinding.pro
index 75b48aa854..f7a185d27a 100644
--- a/tests/auto/qml/qjsonbinding/qjsonbinding.pro
+++ b/tests/auto/qml/qjsonbinding/qjsonbinding.pro
@@ -3,7 +3,6 @@ TARGET = tst_qjsonbinding
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qjsonbinding.cpp
-INCLUDEPATH += ../../shared
 
 include (../../shared/util.pri)
 
diff --git a/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro b/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro
index 9f8c8a4e24..a74334ef63 100644
--- a/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro
+++ b/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qqmlcomponent
 macx:CONFIG -= app_bundle
 
-INCLUDEPATH += ../../shared/
 SOURCES += tst_qqmlcomponent.cpp \
             ../../shared/testhttpserver.cpp
 
diff --git a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
index 101181bba0..0dd9365366 100644
--- a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
+++ b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
@@ -7,7 +7,6 @@ SOURCES += tst_qqmlecmascript.cpp \
            ../../shared/testhttpserver.cpp
 HEADERS += testtypes.h \
            ../../shared/testhttpserver.h
-INCLUDEPATH += ../../shared
 
 RESOURCES += qqmlecmascript.qrc
 
diff --git a/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro b/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro
index 719fd6c350..542ec44736 100644
--- a/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro
+++ b/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qqmlinstantiator
 macx:CONFIG -= app_bundle
 
-INCLUDEPATH += ../../shared/
 SOURCES += tst_qqmlinstantiator.cpp
 HEADERS += stringmodel.h
 
diff --git a/tests/auto/qml/qqmllanguage/qqmllanguage.pro b/tests/auto/qml/qqmllanguage/qqmllanguage.pro
index 99c0c3e823..3e88f3f0db 100644
--- a/tests/auto/qml/qqmllanguage/qqmllanguage.pro
+++ b/tests/auto/qml/qqmllanguage/qqmllanguage.pro
@@ -6,7 +6,6 @@ SOURCES += tst_qqmllanguage.cpp \
            testtypes.cpp
 HEADERS += testtypes.h
 
-INCLUDEPATH += ../../shared/
 HEADERS += ../../shared/testhttpserver.h
 SOURCES += ../../shared/testhttpserver.cpp
 
diff --git a/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro b/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro
index 44b2963918..572ab1d572 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro
+++ b/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qqmlxmlhttprequest
 macx:CONFIG -= app_bundle
 
-INCLUDEPATH += ../../shared/
 HEADERS += ../../shared/testhttpserver.h
 
 SOURCES += tst_qqmlxmlhttprequest.cpp \
diff --git a/tests/auto/quick/qquickloader/qquickloader.pro b/tests/auto/quick/qquickloader/qquickloader.pro
index 32350388e8..31231b702a 100644
--- a/tests/auto/quick/qquickloader/qquickloader.pro
+++ b/tests/auto/quick/qquickloader/qquickloader.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qquickloader
 macx:CONFIG -= app_bundle
 
-INCLUDEPATH += ../../shared/
 HEADERS += ../../shared/testhttpserver.h
 
 SOURCES += tst_qquickloader.cpp \
diff --git a/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro b/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro
index 185eb2c213..52b798e829 100644
--- a/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro
+++ b/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro
@@ -5,7 +5,6 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qquickpixmapcache.cpp \
            ../../shared/testhttpserver.cpp
 HEADERS += ../../shared/testhttpserver.h
-INCLUDEPATH += ../../shared/
 
 include (../../shared/util.pri)
 
diff --git a/tests/auto/quick/qquicktext/qquicktext.pro b/tests/auto/quick/qquicktext/qquicktext.pro
index 4f4b77ed7b..f76e8c95b2 100644
--- a/tests/auto/quick/qquicktext/qquicktext.pro
+++ b/tests/auto/quick/qquicktext/qquicktext.pro
@@ -4,7 +4,6 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qquicktext.cpp
 
-INCLUDEPATH += ../../shared/
 HEADERS += ../../shared/testhttpserver.h
 SOURCES += ../../shared/testhttpserver.cpp
 
diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri
index 8e82dcb33b..a05af4773d 100644
--- a/tests/auto/shared/util.pri
+++ b/tests/auto/shared/util.pri
@@ -1,4 +1,5 @@
 
+INCLUDEPATH += $$PWD
 HEADERS += $$PWD/util.h
 SOURCES += $$PWD/util.cpp