selftests: eliminated usage of qttest_p4.prf

qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.

Change-Id: Ib6f0a59fa54d1e002a05587362f95678c3b3fc26
Reviewed-by: Jason McDonald
(cherry picked from commit 81aa7f44143376b4d52fb4bcd2f0ae4158eae62e)
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>

38 files changed, 41 insertions, 80 deletions

diff --git a/tests/auto/selftests/alive/alive.pro b/tests/auto/selftests/alive/alive.pro
index 08cf358036..d3df09b10d 100644
--- a/tests/auto/selftests/alive/alive.pro
+++ b/tests/auto/selftests/alive/alive.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_alive.cpp
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/assert/assert.pro b/tests/auto/selftests/assert/assert.pro
index 0e48375784..e697f6588c 100644
--- a/tests/auto/selftests/assert/assert.pro
+++ b/tests/auto/selftests/assert/assert.pro
@@ -1,7 +1,5 @@
-load(qttest_p4)
-
 SOURCES += tst_assert.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/badxml/badxml.pro b/tests/auto/selftests/badxml/badxml.pro
index 323791a17c..ab2d847bae 100644
--- a/tests/auto/selftests/badxml/badxml.pro
+++ b/tests/auto/selftests/badxml/badxml.pro
@@ -1,7 +1,5 @@
-load(qttest_p4)
-
 SOURCES += tst_badxml.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro b/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro
index c9ec7e237f..baa996c8d3 100644
--- a/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro
+++ b/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_benchlibcallgrind.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro b/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro
index 44b02953b4..d1fe909fa1 100644
--- a/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro
+++ b/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_benchlibeventcounter.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/benchliboptions/benchliboptions.pro b/tests/auto/selftests/benchliboptions/benchliboptions.pro
index 4dee69fa5a..73173b0a08 100644
--- a/tests/auto/selftests/benchliboptions/benchliboptions.pro
+++ b/tests/auto/selftests/benchliboptions/benchliboptions.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_benchliboptions.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro b/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro
index 3621449862..ba0502f005 100644
--- a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro
+++ b/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_benchlibtickcounter.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro b/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro
index f4694b59ad..0e689871ab 100644
--- a/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro
+++ b/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_benchlibwalltime.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/cmptest/cmptest.pro b/tests/auto/selftests/cmptest/cmptest.pro
index 8b2df1c923..ac392b0234 100644
--- a/tests/auto/selftests/cmptest/cmptest.pro
+++ b/tests/auto/selftests/cmptest/cmptest.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_cmptest.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/commandlinedata/commandlinedata.pro b/tests/auto/selftests/commandlinedata/commandlinedata.pro
index 96bfa5b9d3..9dd1212eba 100644
--- a/tests/auto/selftests/commandlinedata/commandlinedata.pro
+++ b/tests/auto/selftests/commandlinedata/commandlinedata.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_commandlinedata.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/crashes/crashes.pro b/tests/auto/selftests/crashes/crashes.pro
index 7eec6eacb1..e9f0f3e5b7 100644
--- a/tests/auto/selftests/crashes/crashes.pro
+++ b/tests/auto/selftests/crashes/crashes.pro
@@ -1,7 +1,5 @@
-load(qttest_p4)
-
 SOURCES += tst_crashes.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/datatable/datatable.pro b/tests/auto/selftests/datatable/datatable.pro
index 98f04d6864..7c36d4a911 100644
--- a/tests/auto/selftests/datatable/datatable.pro
+++ b/tests/auto/selftests/datatable/datatable.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_datatable.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/datetime/datetime.pro b/tests/auto/selftests/datetime/datetime.pro
index b015661371..f73a763d6b 100644
--- a/tests/auto/selftests/datetime/datetime.pro
+++ b/tests/auto/selftests/datetime/datetime.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_datetime.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/differentexec/differentexec.pro b/tests/auto/selftests/differentexec/differentexec.pro
index c11b0d3608..60000d12ea 100644
--- a/tests/auto/selftests/differentexec/differentexec.pro
+++ b/tests/auto/selftests/differentexec/differentexec.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_differentexec.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/exceptionthrow/exceptionthrow.pro b/tests/auto/selftests/exceptionthrow/exceptionthrow.pro
index 641818ca18..4a72181a07 100644
--- a/tests/auto/selftests/exceptionthrow/exceptionthrow.pro
+++ b/tests/auto/selftests/exceptionthrow/exceptionthrow.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_exceptionthrow.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/expectfail/expectfail.pro b/tests/auto/selftests/expectfail/expectfail.pro
index 97a35607ef..a2916b2830 100644
--- a/tests/auto/selftests/expectfail/expectfail.pro
+++ b/tests/auto/selftests/expectfail/expectfail.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_expectfail.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/failinit/failinit.pro b/tests/auto/selftests/failinit/failinit.pro
index e3d54c860c..9a781840c6 100644
--- a/tests/auto/selftests/failinit/failinit.pro
+++ b/tests/auto/selftests/failinit/failinit.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_failinit.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/failinitdata/failinitdata.pro b/tests/auto/selftests/failinitdata/failinitdata.pro
index 1ff96f74eb..7b0b15a59b 100644
--- a/tests/auto/selftests/failinitdata/failinitdata.pro
+++ b/tests/auto/selftests/failinitdata/failinitdata.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_failinitdata.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/fetchbogus/fetchbogus.pro b/tests/auto/selftests/fetchbogus/fetchbogus.pro
index 3a5d13b78e..1f8652d533 100644
--- a/tests/auto/selftests/fetchbogus/fetchbogus.pro
+++ b/tests/auto/selftests/fetchbogus/fetchbogus.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_fetchbogus.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/globaldata/globaldata.pro b/tests/auto/selftests/globaldata/globaldata.pro
index 1bdcf07890..3d49d3515b 100644
--- a/tests/auto/selftests/globaldata/globaldata.pro
+++ b/tests/auto/selftests/globaldata/globaldata.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_globaldata.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/longstring/longstring.pro b/tests/auto/selftests/longstring/longstring.pro
index b917481764..9b393e9cc7 100644
--- a/tests/auto/selftests/longstring/longstring.pro
+++ b/tests/auto/selftests/longstring/longstring.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_longstring.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/maxwarnings/maxwarnings.pro b/tests/auto/selftests/maxwarnings/maxwarnings.pro
index 393a96464c..9ebdde5015 100644
--- a/tests/auto/selftests/maxwarnings/maxwarnings.pro
+++ b/tests/auto/selftests/maxwarnings/maxwarnings.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += maxwarnings.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/multiexec/multiexec.pro b/tests/auto/selftests/multiexec/multiexec.pro
index 639b9b8e5f..79ae010bcb 100644
--- a/tests/auto/selftests/multiexec/multiexec.pro
+++ b/tests/auto/selftests/multiexec/multiexec.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_multiexec.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/printdatatags/printdatatags.pro b/tests/auto/selftests/printdatatags/printdatatags.pro
index a134422d8b..cd06384835 100644
--- a/tests/auto/selftests/printdatatags/printdatatags.pro
+++ b/tests/auto/selftests/printdatatags/printdatatags.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_printdatatags.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro b/tests/auto/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro
index 100ba1c7af..f1cf25d104 100644
--- a/tests/auto/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro
+++ b/tests/auto/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_printdatatagswithglobaltags.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/qexecstringlist/qexecstringlist.pro b/tests/auto/selftests/qexecstringlist/qexecstringlist.pro
index 73bdaca06e..de8a7da37e 100644
--- a/tests/auto/selftests/qexecstringlist/qexecstringlist.pro
+++ b/tests/auto/selftests/qexecstringlist/qexecstringlist.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_qexecstringlist.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/singleskip/singleskip.pro b/tests/auto/selftests/singleskip/singleskip.pro
index 9762c97a09..f4bde92d62 100644
--- a/tests/auto/selftests/singleskip/singleskip.pro
+++ b/tests/auto/selftests/singleskip/singleskip.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_singleskip.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/skip/skip.pro b/tests/auto/selftests/skip/skip.pro
index 989fdeb627..82576212ad 100644
--- a/tests/auto/selftests/skip/skip.pro
+++ b/tests/auto/selftests/skip/skip.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_skip.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/skipglobal/skipglobal.pro b/tests/auto/selftests/skipglobal/skipglobal.pro
index 0205a88e2f..43093ed89c 100644
--- a/tests/auto/selftests/skipglobal/skipglobal.pro
+++ b/tests/auto/selftests/skipglobal/skipglobal.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_skipglobal.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/skipinit/skipinit.pro b/tests/auto/selftests/skipinit/skipinit.pro
index 691218312b..848252eabd 100644
--- a/tests/auto/selftests/skipinit/skipinit.pro
+++ b/tests/auto/selftests/skipinit/skipinit.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_skipinit.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/skipinitdata/skipinitdata.pro b/tests/auto/selftests/skipinitdata/skipinitdata.pro
index 206ed11f73..762543a60b 100644
--- a/tests/auto/selftests/skipinitdata/skipinitdata.pro
+++ b/tests/auto/selftests/skipinitdata/skipinitdata.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_skipinitdata.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/sleep/sleep.pro b/tests/auto/selftests/sleep/sleep.pro
index 0bd322549f..e0ae72f54a 100644
--- a/tests/auto/selftests/sleep/sleep.pro
+++ b/tests/auto/selftests/sleep/sleep.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_sleep.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/strcmp/strcmp.pro b/tests/auto/selftests/strcmp/strcmp.pro
index 3121c25a1b..ac1f1e840e 100644
--- a/tests/auto/selftests/strcmp/strcmp.pro
+++ b/tests/auto/selftests/strcmp/strcmp.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_strcmp.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/subtest/subtest.pro b/tests/auto/selftests/subtest/subtest.pro
index fe3cafa14a..3066f20247 100644
--- a/tests/auto/selftests/subtest/subtest.pro
+++ b/tests/auto/selftests/subtest/subtest.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_subtest.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/test/test.pro b/tests/auto/selftests/test/test.pro
index d61606cefb..2dd634f6e7 100644
--- a/tests/auto/selftests/test/test.pro
+++ b/tests/auto/selftests/test/test.pro
@@ -1,13 +1,12 @@
-load(qttest_p4)
-SOURCES += ../tst_selftests.cpp
-QT += core xml
-
+CONFIG += testcase
 TARGET = ../tst_selftests
+QT = core xml testlib
+SOURCES += ../tst_selftests.cpp
 
 win32 {
   CONFIG(debug, debug|release) {
     TARGET = ../../debug/tst_selftests
-} else {
+  } else {
     TARGET = ../../release/tst_selftests
   }
 }
diff --git a/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro b/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro
index cf3098ddcf..94188a2001 100644
--- a/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro
+++ b/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
-QT -= gui
+QT = core testlib
 SOURCES += tst_waitwithoutgui.cpp
 
 mac:CONFIG -= app_bundle
diff --git a/tests/auto/selftests/warnings/warnings.pro b/tests/auto/selftests/warnings/warnings.pro
index eaf06b41d8..0c6ca01588 100644
--- a/tests/auto/selftests/warnings/warnings.pro
+++ b/tests/auto/selftests/warnings/warnings.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
 SOURCES += tst_warnings.cpp
-QT = core
+QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/selftests/xunit/xunit.pro b/tests/auto/selftests/xunit/xunit.pro
index 55aca4a6ae..d3ae402e6f 100644
--- a/tests/auto/selftests/xunit/xunit.pro
+++ b/tests/auto/selftests/xunit/xunit.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+QT = core testlib
 SOURCES  += tst_xunit.cpp
 
 mac:CONFIG -= app_bundle