From 28b36b736dca643eaaf62bf52862f884fe256027 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 7 Oct 2011 15:54:24 +1000 Subject: 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: Ib79b3c07de18a997cfcb977ffb3faf9f76fdf158 Reviewed-on: http://codereview.qt-project.org/6215 Sanity-Review: Qt Sanity Bot Reviewed-by: Jason McDonald --- tests/auto/headersclean/headersclean.pro | 5 +++-- tests/auto/qscriptable/qscriptable.pro | 5 +++-- tests/auto/qscriptclass/qscriptclass.pro | 5 +++-- tests/auto/qscriptcontext/qscriptcontext.pro | 5 +++-- tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro | 5 +++-- tests/auto/qscriptengine/qscriptengine.pro | 5 +++-- tests/auto/qscriptengineagent/qscriptengineagent.pro | 5 +++-- tests/auto/qscriptenginedebugger/qscriptenginedebugger.pro | 5 +++-- tests/auto/qscriptextensionplugin/test/test.pro | 5 +++-- tests/auto/qscriptextqobject/qscriptextqobject.pro | 5 +++-- tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro | 5 +++-- tests/auto/qscriptstring/qscriptstring.pro | 5 +++-- tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro | 5 +++-- tests/auto/qscriptvalue/qscriptvalue.pro | 5 +++-- tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro | 5 +++-- tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro | 5 +++-- tests/benchmarks/script/context2d/context2d.pro | 4 ++-- tests/benchmarks/script/qscriptclass/qscriptclass.pro | 4 ++-- .../script/qscriptclass_bytearray/qscriptclass_bytearray.pro | 4 ++-- tests/benchmarks/script/qscriptengine/qscriptengine.pro | 4 ++-- tests/benchmarks/script/qscriptqobject/qscriptqobject.pro | 4 ++-- tests/benchmarks/script/qscriptvalue/qscriptvalue.pro | 4 ++-- .../benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro | 4 ++-- tests/benchmarks/script/sunspider/sunspider.pro | 4 ++-- tests/benchmarks/script/v8/v8.pro | 4 ++-- 25 files changed, 66 insertions(+), 50 deletions(-) diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 73a226d..d208f87 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +TARGET = tst_headersclean +CONFIG += testcase SOURCES += tst_headersclean.cpp -QT = core +QT = core testlib contains(QT_CONFIG,script): QT += script contains(QT_CONFIG,scripttools): QT += scripttools diff --git a/tests/auto/qscriptable/qscriptable.pro b/tests/auto/qscriptable/qscriptable.pro index a3988b5..6852c4d 100644 --- a/tests/auto/qscriptable/qscriptable.pro +++ b/tests/auto/qscriptable/qscriptable.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptable +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptable.cpp diff --git a/tests/auto/qscriptclass/qscriptclass.pro b/tests/auto/qscriptclass/qscriptclass.pro index 76028dd..aae2dd1 100644 --- a/tests/auto/qscriptclass/qscriptclass.pro +++ b/tests/auto/qscriptclass/qscriptclass.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptclass +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptclass.cpp diff --git a/tests/auto/qscriptcontext/qscriptcontext.pro b/tests/auto/qscriptcontext/qscriptcontext.pro index 9746db8..5ca1a2f 100644 --- a/tests/auto/qscriptcontext/qscriptcontext.pro +++ b/tests/auto/qscriptcontext/qscriptcontext.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptcontext +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptcontext.cpp diff --git a/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro b/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro index 2483414..a2ddc27 100644 --- a/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro +++ b/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptcontextinfo +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptcontextinfo.cpp diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro index 3769354..834be2a 100644 --- a/tests/auto/qscriptengine/qscriptengine.pro +++ b/tests/auto/qscriptengine/qscriptengine.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core gui widgets script script-private +TARGET = tst_qscriptengine +CONFIG += testcase +QT = core gui widgets script script-private testlib SOURCES += tst_qscriptengine.cpp RESOURCES += qscriptengine.qrc diff --git a/tests/auto/qscriptengineagent/qscriptengineagent.pro b/tests/auto/qscriptengineagent/qscriptengineagent.pro index 34c4280..94a6641 100644 --- a/tests/auto/qscriptengineagent/qscriptengineagent.pro +++ b/tests/auto/qscriptengineagent/qscriptengineagent.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptengineagent +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptengineagent.cpp diff --git a/tests/auto/qscriptenginedebugger/qscriptenginedebugger.pro b/tests/auto/qscriptenginedebugger/qscriptenginedebugger.pro index 26f4b12..de24b73 100644 --- a/tests/auto/qscriptenginedebugger/qscriptenginedebugger.pro +++ b/tests/auto/qscriptenginedebugger/qscriptenginedebugger.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT += script widgets scripttools +TARGET = tst_qscriptenginedebugger +CONFIG += testcase +QT += script widgets scripttools testlib SOURCES += tst_qscriptenginedebugger.cpp diff --git a/tests/auto/qscriptextensionplugin/test/test.pro b/tests/auto/qscriptextensionplugin/test/test.pro index 549bac2..7601078 100644 --- a/tests/auto/qscriptextensionplugin/test/test.pro +++ b/tests/auto/qscriptextensionplugin/test/test.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +TARGET = tst_test +CONFIG += testcase -QT = core script +QT = core script testlib SOURCES = ../tst_qscriptextensionplugin.cpp CONFIG -= app_bundle LIBS += -L../plugins/script -lstaticplugin diff --git a/tests/auto/qscriptextqobject/qscriptextqobject.pro b/tests/auto/qscriptextqobject/qscriptextqobject.pro index 6d2f652..5596ff3 100644 --- a/tests/auto/qscriptextqobject/qscriptextqobject.pro +++ b/tests/auto/qscriptextqobject/qscriptextqobject.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core gui widgets script +TARGET = tst_qscriptextqobject +CONFIG += testcase +QT = core gui widgets script testlib SOURCES += tst_qscriptextqobject.cpp diff --git a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro index 471aa02..86a928b 100644 --- a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro +++ b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptjstestsuite +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptjstestsuite.cpp RESOURCES += qscriptjstestsuite.qrc include(../qscriptv8testsuite/abstracttestsuite.pri) diff --git a/tests/auto/qscriptstring/qscriptstring.pro b/tests/auto/qscriptstring/qscriptstring.pro index ebe685a..393454f 100644 --- a/tests/auto/qscriptstring/qscriptstring.pro +++ b/tests/auto/qscriptstring/qscriptstring.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptstring +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptstring.cpp diff --git a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro index e1c6234..2d0b5b1 100644 --- a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro +++ b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptv8testsuite +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptv8testsuite.cpp RESOURCES += qscriptv8testsuite.qrc include(abstracttestsuite.pri) diff --git a/tests/auto/qscriptvalue/qscriptvalue.pro b/tests/auto/qscriptvalue/qscriptvalue.pro index c326fbf..f0f4ff9 100644 --- a/tests/auto/qscriptvalue/qscriptvalue.pro +++ b/tests/auto/qscriptvalue/qscriptvalue.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core gui widgets script +TARGET = tst_qscriptvalue +CONFIG += testcase +QT = core gui widgets script testlib SOURCES += tst_qscriptvalue.cpp HEADERS += tst_qscriptvalue.h diff --git a/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro b/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro index 27b30a8..a8c32a1 100644 --- a/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro +++ b/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptvaluegenerated +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptvalue.cpp HEADERS += tst_qscriptvalue.h diff --git a/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro b/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro index 884efa0..ec07a80 100644 --- a/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro +++ b/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core script +TARGET = tst_qscriptvalueiterator +CONFIG += testcase +QT = core script testlib SOURCES += tst_qscriptvalueiterator.cpp diff --git a/tests/benchmarks/script/context2d/context2d.pro b/tests/benchmarks/script/context2d/context2d.pro index bc94c4f..4de78da 100644 --- a/tests/benchmarks/script/context2d/context2d.pro +++ b/tests/benchmarks/script/context2d/context2d.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_context2d @@ -19,4 +19,4 @@ SOURCES += $$CONTEXT2D_EXAMPLE_DIR/qcontext2dcanvas.cpp \ RESOURCES += $$CONTEXT2D_EXAMPLE_DIR/context2d.qrc -QT += script +QT += script testlib diff --git a/tests/benchmarks/script/qscriptclass/qscriptclass.pro b/tests/benchmarks/script/qscriptclass/qscriptclass.pro index 90c9582..61787ff 100644 --- a/tests/benchmarks/script/qscriptclass/qscriptclass.pro +++ b/tests/benchmarks/script/qscriptclass/qscriptclass.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qscriptclass SOURCES += tst_qscriptclass.cpp -QT += script +QT += script testlib diff --git a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro index d64f705..6b0f6dc 100644 --- a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro +++ b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qscriptclass_bytearray @@ -7,4 +7,4 @@ RESOURCES += qscriptclass_bytearray.qrc include($$QT_SOURCE_TREE/examples/script/customclass/bytearrayclass.pri) -QT = core script +QT = core script testlib diff --git a/tests/benchmarks/script/qscriptengine/qscriptengine.pro b/tests/benchmarks/script/qscriptengine/qscriptengine.pro index 72a547a..d8155f3 100644 --- a/tests/benchmarks/script/qscriptengine/qscriptengine.pro +++ b/tests/benchmarks/script/qscriptengine/qscriptengine.pro @@ -1,10 +1,10 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qscriptengine SOURCES += tst_qscriptengine.cpp -QT += script +QT += script testlib symbian* { TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB diff --git a/tests/benchmarks/script/qscriptqobject/qscriptqobject.pro b/tests/benchmarks/script/qscriptqobject/qscriptqobject.pro index 30bc447..c69c60d 100644 --- a/tests/benchmarks/script/qscriptqobject/qscriptqobject.pro +++ b/tests/benchmarks/script/qscriptqobject/qscriptqobject.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qscriptqobject SOURCES += tst_qscriptqobject.cpp -QT += script +QT += script testlib diff --git a/tests/benchmarks/script/qscriptvalue/qscriptvalue.pro b/tests/benchmarks/script/qscriptvalue/qscriptvalue.pro index 1c26438..9339e5c 100644 --- a/tests/benchmarks/script/qscriptvalue/qscriptvalue.pro +++ b/tests/benchmarks/script/qscriptvalue/qscriptvalue.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qscriptvalue SOURCES += tst_qscriptvalue.cpp -QT += script +QT += script testlib diff --git a/tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro b/tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro index 0bff039..5d6b67b 100644 --- a/tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro +++ b/tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qscriptvalueiterator SOURCES += tst_qscriptvalueiterator.cpp -QT = core script +QT = core script testlib diff --git a/tests/benchmarks/script/sunspider/sunspider.pro b/tests/benchmarks/script/sunspider/sunspider.pro index dce3855..1409771 100644 --- a/tests/benchmarks/script/sunspider/sunspider.pro +++ b/tests/benchmarks/script/sunspider/sunspider.pro @@ -1,10 +1,10 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_sunspider RESOURCES += sunspider.qrc SOURCES += tst_sunspider.cpp -QT = core script +QT = core script testlib symbian* { TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB diff --git a/tests/benchmarks/script/v8/v8.pro b/tests/benchmarks/script/v8/v8.pro index 547eecc..1e78b3a 100644 --- a/tests/benchmarks/script/v8/v8.pro +++ b/tests/benchmarks/script/v8/v8.pro @@ -1,10 +1,10 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_v8 RESOURCES += v8.qrc SOURCES += tst_v8.cpp -QT = core script +QT = core script testlib symbian* { TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB -- cgit v1.2.1