tests: 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: Ie775d011e6f63d4d174c2be78cda138d7bbe85ff
Reviewed-on: http://codereview.qt-project.org/6186
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

diff --git a/src/linguist/tests/tests.pro b/src/linguist/tests/tests.pro
index a67725c..dc878bb 100644 (file)
--- a/src/linguist/tests/tests.pro
+++ b/src/linguist/tests/tests.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+TARGET = tst_tests
+CONFIG += testcase
 
-QT += xml
+QT += xml testlib
 
 HEADERS += \
     tst_linguist.h \

diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index 4dfe3f8..0851cad 100644 (file)
--- 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 517dacd..af29c58 100644 (file)
--- 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 8006042..ba69b7f 100644 (file)
--- 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 3c69998..34523a6 100644 (file)
--- 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 dedd0aa..2e19047 100644 (file)
--- 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 94ef621..0cd8298 100644 (file)
--- 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 b4b07dd..8c9506c 100644 (file)
--- 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 927c2e1..730136a 100644 (file)
--- 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 92dc620..72a91be 100644 (file)
--- 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 1262470..4263310 100644 (file)
--- 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