diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-10-11 15:14:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-11 09:50:28 +0200 |
| commit | 47e1b91b47dcf59dbeff2740add94ceda188c6bc (patch) | |
| tree | b8bdf4f857d7958716249fb2ab15a4431dcfdb23 /tests/benchmarks/declarative | |
| parent | 1fcafbebc8fcb445e3bc8d9d54f57e4ffee39f55 (diff) | |
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.
Since QT+= had to be touched already, this change also removes a lot of
useless duplication on those lines.
Change-Id: I9f2f20eaf4a0e676beddf474c7db8680e4712f78
Reviewed-on: http://codereview.qt-project.org/6302
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/benchmarks/declarative')
16 files changed, 32 insertions, 33 deletions
diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/declarative/binding/binding.pro index c9567d3648..ba59080232 100644 --- a/tests/benchmarks/declarative/binding/binding.pro +++ b/tests/benchmarks/declarative/binding/binding.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_binding -QT += declarative +QT += declarative testlib macx:CONFIG -= app_bundle SOURCES += tst_binding.cpp testtypes.cpp diff --git a/tests/benchmarks/declarative/compilation/compilation.pro b/tests/benchmarks/declarative/compilation/compilation.pro index 32f4aba52f..44ea3d0c68 100644 --- a/tests/benchmarks/declarative/compilation/compilation.pro +++ b/tests/benchmarks/declarative/compilation/compilation.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_compilation -QT += declarative +QT += declarative testlib macx:CONFIG -= app_bundle CONFIG += release diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro index a93eab8bac..6d0d9d7e8f 100644 --- a/tests/benchmarks/declarative/creation/creation.pro +++ b/tests/benchmarks/declarative/creation/creation.pro @@ -1,11 +1,10 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_creation -QT += declarative qtquick1 widgets macx:CONFIG -= app_bundle SOURCES += tst_creation.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private declarative-private qtquick1-private widgets testlib diff --git a/tests/benchmarks/declarative/holistic/holistic.pro b/tests/benchmarks/declarative/holistic/holistic.pro index 4be45f576a..586af79275 100644 --- a/tests/benchmarks/declarative/holistic/holistic.pro +++ b/tests/benchmarks/declarative/holistic/holistic.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_holistic -QT += declarative network +QT += declarative network testlib macx:CONFIG -= app_bundle CONFIG += release diff --git a/tests/benchmarks/declarative/javascript/javascript.pro b/tests/benchmarks/declarative/javascript/javascript.pro index 7395cef07e..8026540309 100644 --- a/tests/benchmarks/declarative/javascript/javascript.pro +++ b/tests/benchmarks/declarative/javascript/javascript.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_javascript -QT += declarative +QT += declarative testlib macx:CONFIG -= app_bundle SOURCES += tst_javascript.cpp testtypes.cpp diff --git a/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro b/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro index b82961886b..f04da8ec95 100644 --- a/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro +++ b/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qjsengine SOURCES += tst_qjsengine.cpp -QT += declarative +QT += declarative testlib diff --git a/tests/benchmarks/declarative/js/qjsvalue/qjsvalue.pro b/tests/benchmarks/declarative/js/qjsvalue/qjsvalue.pro index 48c40a2a52..2dc917d3aa 100644 --- a/tests/benchmarks/declarative/js/qjsvalue/qjsvalue.pro +++ b/tests/benchmarks/declarative/js/qjsvalue/qjsvalue.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qjsvalue SOURCES += tst_qjsvalue.cpp -QT += declarative +QT += declarative testlib diff --git a/tests/benchmarks/declarative/js/qjsvalueiterator/qjsvalueiterator.pro b/tests/benchmarks/declarative/js/qjsvalueiterator/qjsvalueiterator.pro index a114b863f6..a15ceba9a4 100644 --- a/tests/benchmarks/declarative/js/qjsvalueiterator/qjsvalueiterator.pro +++ b/tests/benchmarks/declarative/js/qjsvalueiterator/qjsvalueiterator.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qjsvalueiterator SOURCES += tst_qjsvalueiterator.cpp -QT = core declarative +QT = core declarative testlib diff --git a/tests/benchmarks/declarative/pointers/pointers.pro b/tests/benchmarks/declarative/pointers/pointers.pro index 5180a2a9d1..d4112f94ec 100644 --- a/tests/benchmarks/declarative/pointers/pointers.pro +++ b/tests/benchmarks/declarative/pointers/pointers.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT += declarative +CONFIG += testcase +QT += declarative testlib TEMPLATE = app TARGET = tst_pointers macx:CONFIG -= app_bundle diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index da5765a72d..0d415db8ba 100644 --- a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_qdeclarativecomponent -QT += declarative +QT += declarative testlib macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativecomponent.cpp testtypes.cpp diff --git a/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro b/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro index e9aea4f71c..6f2712adec 100644 --- a/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro +++ b/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT += declarative +CONFIG += testcase +QT += declarative testlib TEMPLATE = app TARGET = tst_qdeclarativedebugtrace macx:CONFIG -= app_bundle diff --git a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro index 71dfdf3f98..6a46e8f40c 100644 --- a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_qdeclarativeimage -QT += declarative +QT += declarative testlib macx:CONFIG -= app_bundle CONFIG += release diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro index 79fdd262cd..1ac0bb240a 100644 --- a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro +++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_qdeclarativemetaproperty -QT += declarative +QT += declarative testlib macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativemetaproperty.cpp diff --git a/tests/benchmarks/declarative/qmltime/qmltime.pro b/tests/benchmarks/declarative/qmltime/qmltime.pro index 5dd371a672..e1948981bf 100644 --- a/tests/benchmarks/declarative/qmltime/qmltime.pro +++ b/tests/benchmarks/declarative/qmltime/qmltime.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = qmltime -QT += declarative widgets +QT += declarative widgets testlib macx:CONFIG -= app_bundle SOURCES += qmltime.cpp diff --git a/tests/benchmarks/declarative/script/script.pro b/tests/benchmarks/declarative/script/script.pro index 71d448552c..310d17d3c9 100644 --- a/tests/benchmarks/declarative/script/script.pro +++ b/tests/benchmarks/declarative/script/script.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_script -QT += declarative +QT += declarative testlib macx:CONFIG -= app_bundle CONFIG += release diff --git a/tests/benchmarks/declarative/typeimports/typeimports.pro b/tests/benchmarks/declarative/typeimports/typeimports.pro index c18cbed773..403387f0ce 100644 --- a/tests/benchmarks/declarative/typeimports/typeimports.pro +++ b/tests/benchmarks/declarative/typeimports/typeimports.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_typeimports -QT += declarative +QT += declarative testlib macx:CONFIG -= app_bundle SOURCES += tst_typeimports.cpp |