tests: Make the QT assignments more explicit

Remove unused 'QT -= gui' and replace some others with
'QT = core ...'

Change-Id: I2d14fae963afc21dbd21a4acdbba2c30cdf8fa61
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

16 files changed, 15 insertions, 32 deletions

diff --git a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
index 0dc7903c4c..8823d54590 100644
--- a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
+++ b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
@@ -1,7 +1,7 @@
 CONFIG -= app_bundle debug_and_release
 CONFIG += console
 DESTDIR = ./
-QT -= gui
+QT = core
 wince*: {
    LIBS += coredll.lib
 }
diff --git a/tests/auto/corelib/plugin/qlibrary/qlibrary.pro b/tests/auto/corelib/plugin/qlibrary/qlibrary.pro
index 49c29d7edc..5bdf780fc0 100644
--- a/tests/auto/corelib/plugin/qlibrary/qlibrary.pro
+++ b/tests/auto/corelib/plugin/qlibrary/qlibrary.pro
@@ -1,4 +1,4 @@
-QT -= gui
+QT = core
 TEMPLATE    =	subdirs
 CONFIG  += ordered
 
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.pro b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.pro
index 59597abe7b..dc480fc88c 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.pro
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.pro
@@ -1,7 +1,6 @@
 SOURCES = qmyserver.cpp
 HEADERS = ../myobject.h
 TARGET = qmyserver
-QT += dbus
-QT -= gui
+QT = core dbus
 CONFIG -= app_bundle
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.pro b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.pro
index 605b52e3aa..b863135b68 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.pro
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.pro
@@ -1,6 +1,5 @@
 SOURCES = qpinger.cpp ../interface.cpp
 HEADERS = ../interface.h
 TARGET = qpinger
-QT += dbus
-QT -= gui
+QT = core dbus
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro
index 59597abe7b..dc480fc88c 100644
--- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro
@@ -1,7 +1,6 @@
 SOURCES = qmyserver.cpp
 HEADERS = ../myobject.h
 TARGET = qmyserver
-QT += dbus
-QT -= gui
+QT = core dbus
 CONFIG -= app_bundle
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/dbus/qdbusmarshall/qpong/qpong.pro b/tests/auto/dbus/qdbusmarshall/qpong/qpong.pro
index a63e915d9a..d652036034 100644
--- a/tests/auto/dbus/qdbusmarshall/qpong/qpong.pro
+++ b/tests/auto/dbus/qdbusmarshall/qpong/qpong.pro
@@ -1,7 +1,5 @@
 SOURCES = qpong.cpp
 TARGET = qpong
-QT += dbus
-QT -= gui
-
+QT = core dbus
 
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
index 56572a2490..2b5ffab088 100644
--- a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
+++ b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
@@ -1,8 +1,7 @@
 CONFIG += testcase
 CONFIG += parallel_test
 TARGET = tst_qabstractnetworkcache
-QT += network testlib
-QT -= gui
+QT = core network testlib
 SOURCES  += tst_qabstractnetworkcache.cpp
 
 TESTDATA += tests/*
diff --git a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro
index ebef3b007d..7342252963 100644
--- a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro
+++ b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro
@@ -1,7 +1,6 @@
 CONFIG += testcase
 CONFIG += parallel_test
 TARGET = tst_qnetworkcachemetadata
-QT -= gui
-QT += network testlib
+QT = core network testlib
 SOURCES  += tst_qnetworkcachemetadata.cpp
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
index d84a332870..57f9c0534a 100644
--- a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
+++ b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
@@ -1,7 +1,6 @@
 CONFIG += testcase
 CONFIG += parallel_test
 TARGET = tst_qnetworkdiskcache
-QT -= gui
-QT += network testlib
+QT = core network testlib
 SOURCES  += tst_qnetworkdiskcache.cpp
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
index f799d180cd..d8a6b2cdcb 100644
--- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
+++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
@@ -2,8 +2,7 @@ CONFIG += testcase
 
 SOURCES += tst_qsslsocket.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += core-private network-private testlib
-QT -= gui
+QT = core core-private network-private testlib
 
 TARGET = tst_qsslsocket
 
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
index 1626b62286..e8247d7b16 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -4,8 +4,7 @@ testcase.timeout = 300 # this test is slow
 
 SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += core-private network-private testlib
-QT -= gui
+QT = core core-private network-private testlib
 
 TARGET = tst_qsslsocket_onDemandCertificates_member
 
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
index 06fad48d5a..8a95e11780 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
@@ -3,8 +3,7 @@ CONFIG += parallel_test
 
 SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += core-private network-private testlib
-QT -= gui
+QT = core core-private network-private testlib
 
 TARGET = tst_qsslsocket_onDemandCertificates_static
 
diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro
index 1600c458b5..5ea8c06f02 100644
--- a/tests/auto/tools/moc/moc.pro
+++ b/tests/auto/tools/moc/moc.pro
@@ -29,8 +29,7 @@ if(*-g++*|*-icc*|*-clang*|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h wi
 if(*-g++*|*-clang*): HEADERS += dollars.h
 SOURCES += tst_moc.cpp
 
-QT -= gui
-QT += sql network testlib
+QT = core sql network testlib
 qtHaveModule(dbus) {
     DEFINES += WITH_DBUS
     QT += dbus
diff --git a/tests/auto/xml/dom/qdom/qdom.pro b/tests/auto/xml/dom/qdom/qdom.pro
index db19a8ba89..3248b8e0e2 100644
--- a/tests/auto/xml/dom/qdom/qdom.pro
+++ b/tests/auto/xml/dom/qdom/qdom.pro
@@ -3,7 +3,6 @@ TARGET = tst_qdom
 SOURCES  += tst_qdom.cpp
 
 QT = core xml testlib
-QT -= gui
 
 wince* {
    wince*|qt_not_deployed {
diff --git a/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro b/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro
index a8bf834074..8846ae5e4a 100644
--- a/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro
+++ b/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro
@@ -1,7 +1,4 @@
 CONFIG += testcase
 TARGET = tst_qxmlinputsource
 SOURCES  += tst_qxmlinputsource.cpp
-QT += core xml network testlib
-QT -= gui
-
-
+QT = core xml network testlib
diff --git a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
index 981f506c6d..349b976f58 100644
--- a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
+++ b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
@@ -6,7 +6,6 @@ HEADERS +=  parser/parser.h
 SOURCES += tst_qxmlsimplereader.cpp parser/parser.cpp 
 
 CONFIG += no_batch
-QT += network xml testlib
-QT -= gui
+QT = core network xml testlib
 
 TESTDATA += encodings/* xmldocs/*