10 files changed, 27 insertions, 17 deletions
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index 4dfe3f869..0851cad61 100644
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+TARGET = tst_headersclean
+CONFIG += testcase
 SOURCES  += tst_headersclean.cpp
-QT = core
-QT += designer help
+QT = core designer help testlib
diff --git a/tests/auto/linguist/lconvert/lconvert.pro b/tests/auto/linguist/lconvert/lconvert.pro
index 517dacd25..af29c5837 100644
--- a/tests/auto/linguist/lconvert/lconvert.pro
+++ b/tests/auto/linguist/lconvert/lconvert.pro
@@ -1,4 +1,5 @@
-CONFIG += qttest_p4
+CONFIG += testcase
+QT += testlib
 
 TARGET = tst_lconvert
 
diff --git a/tests/auto/linguist/lrelease/lrelease.pro b/tests/auto/linguist/lrelease/lrelease.pro
index 8006042c3..ba69b7ff3 100644
--- a/tests/auto/linguist/lrelease/lrelease.pro
+++ b/tests/auto/linguist/lrelease/lrelease.pro
@@ -1,5 +1,5 @@
-CONFIG += qttest_p4
-CONFIG -= gui
+CONFIG += testcase
+QT = core testlib
 TARGET = tst_lrelease
 
 SOURCES += tst_lrelease.cpp
diff --git a/tests/auto/linguist/lupdate/lupdate.pro b/tests/auto/linguist/lupdate/lupdate.pro
index 3c6999874..34523a6a5 100644
--- a/tests/auto/linguist/lupdate/lupdate.pro
+++ b/tests/auto/linguist/lupdate/lupdate.pro
@@ -1,4 +1,6 @@
-CONFIG += qttest_p4
+CONFIG += testcase
+QT += testlib
+
 # June 2011: Marked as unstable due to tst_lupdate::good(heuristics) failing
 # due to changes in qtbase/mkspecs/features/qt_config.prf.
 CONFIG+=insignificant_test
diff --git a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
index dedd0aab3..2e190478e 100644
--- a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
+++ b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qhelpcontentmodel
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_qhelpcontentmodel.cpp
 
 CONFIG += help
diff --git a/tests/auto/qhelpenginecore/qhelpenginecore.pro b/tests/auto/qhelpenginecore/qhelpenginecore.pro
index 94ef621f6..0cd8298ec 100644
--- a/tests/auto/qhelpenginecore/qhelpenginecore.pro
+++ b/tests/auto/qhelpenginecore/qhelpenginecore.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+TARGET = tst_qhelpenginecore
+CONFIG += testcase
 SOURCES += tst_qhelpenginecore.cpp
 CONFIG  += help
-QT      += sql
+QT      += sql testlib
 
 
 DEFINES += QT_USE_USING_NAMESPACE
diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro
index b4b07dd41..8c9506c8d 100644
--- a/tests/auto/qhelpgenerator/qhelpgenerator.pro
+++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+TARGET = tst_qhelpgenerator
+CONFIG += testcase
 
 SOURCES += tst_qhelpgenerator.cpp
 CONFIG  += help
-QT      += sql
+QT      += sql testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE
diff --git a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
index 927c2e19e..730136aa9 100644
--- a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
+++ b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+TARGET = tst_qhelpindexmodel
+CONFIG += testcase
 
 SOURCES += tst_qhelpindexmodel.cpp
 CONFIG  += help
-QT      += sql
+QT      += sql testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE
diff --git a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
index 92dc620e1..72a91bebd 100644
--- a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
+++ b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
@@ -1,7 +1,9 @@
-load(qttest_p4)
+TARGET = tst_qhelpprojectdata
+CONFIG += testcase
 
 SOURCES += tst_qhelpprojectdata.cpp
 CONFIG  += help
+QT      += testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE
diff --git a/tests/auto/uiloader/uiloader/uiloader.pro b/tests/auto/uiloader/uiloader/uiloader.pro
index 12624703f..42633102a 100644
--- a/tests/auto/uiloader/uiloader/uiloader.pro
+++ b/tests/auto/uiloader/uiloader/uiloader.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
 
 TEMPLATE = app
 !embedded:CONFIG += uitools
@@ -13,7 +13,7 @@ win32 {
   }
 }
 
-QT += widgets network
+QT += widgets network testlib
 
 wince*|symbian: {
    configuration.files = ../*.ini