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/auto/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/auto/declarative')
81 files changed, 241 insertions, 249 deletions
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index edd4d80e6b..e68a93c6d5 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_examples macx:CONFIG -= app_bundle SOURCES += tst_examples.cpp @@ -8,6 +8,6 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private declarative-private qtquick1-private widgets-private v8-private +QT += core-private gui-private declarative-private qtquick1-private widgets-private v8-private testlib qpa:CONFIG+=insignificant_test # QTBUG-20990, aborts diff --git a/tests/auto/declarative/geometry/geometry.pro b/tests/auto/declarative/geometry/geometry.pro index 71d226d503..a66399a6e0 100644 --- a/tests/auto/declarative/geometry/geometry.pro +++ b/tests/auto/declarative/geometry/geometry.pro @@ -1,6 +1,4 @@ -load(qttest_p4) -QT += opengl declarative - +CONFIG += testcase TARGET = tst_geometry macx:CONFIG -= app_bundle @@ -8,4 +6,4 @@ SOURCES += tst_geometry.cpp CONFIG+=parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private opengl testlib diff --git a/tests/auto/declarative/nodes/nodes.pro b/tests/auto/declarative/nodes/nodes.pro index 8fda2f649d..b622c6a4b3 100644 --- a/tests/auto/declarative/nodes/nodes.pro +++ b/tests/auto/declarative/nodes/nodes.pro @@ -1,6 +1,4 @@ -load(qttest_p4) -QT += opengl declarative widgets - +CONFIG += testcase TARGET = tst_nodestest macx:CONFIG -= app_bundle @@ -8,4 +6,4 @@ SOURCES += tst_nodestest.cpp CONFIG+=parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private opengl widgets testlib diff --git a/tests/auto/declarative/parserstress/parserstress.pro b/tests/auto/declarative/parserstress/parserstress.pro index a2e44795da..44dc52cc41 100644 --- a/tests/auto/declarative/parserstress/parserstress.pro +++ b/tests/auto/declarative/parserstress/parserstress.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_parserstress macx:CONFIG -= app_bundle SOURCES += tst_parserstress.cpp @@ -11,4 +11,4 @@ SOURCES += tst_parserstress.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro index 58ed93427a..f4231b5679 100644 --- a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative opengl +CONFIG += testcase +TARGET = tst_qdeclarativeanimations SOURCES += tst_qdeclarativeanimations.cpp macx:CONFIG -= app_bundle @@ -7,4 +7,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro index 4dbffa9dfb..3564f4068d 100644 --- a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro +++ b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro @@ -1,8 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativeapplication macx:CONFIG -= app_bundle #temporary CONFIG += insignificant_test SOURCES += tst_qdeclarativeapplication.cpp -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro index b347b1ea75..7a2fdd4231 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative opengl +CONFIG += testcase +TARGET = tst_qdeclarativebehaviors SOURCES += tst_qdeclarativebehaviors.cpp macx:CONFIG -= app_bundle @@ -7,4 +7,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test insignificant_test -QT += core-private gui-private v8-private declarative-private opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro index 8bc8b6c12b..f2fd7ae1fa 100644 --- a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativebinding macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativebinding.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro b/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro index a8fac10650..f5ab4c6d70 100644 --- a/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro +++ b/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativechangeset macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativechangeset.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index 05a006baf2..156512efee 100644 --- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative -QT += network +CONFIG += testcase +TARGET = tst_qdeclarativecomponent macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativecomponent.cpp @@ -9,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro index 0fa1ebc22b..e2b814d5c1 100644 --- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativeconnection macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeconnection.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro index 8fdd325302..86bec2fabd 100644 --- a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro +++ b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativecontext SOURCES += tst_qdeclarativecontext.cpp macx:CONFIG -= app_bundle @@ -7,4 +7,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro b/tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro index aa7ca093de..3cae5c25f3 100644 --- a/tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro +++ b/tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro @@ -1,9 +1,9 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativecpputils macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativecpputils.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro index 28e25e9450..850a0d4ecc 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro +++ b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += network declarative +CONFIG += testcase +TARGET = tst_qdeclarativedebugclient macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h @@ -8,5 +8,5 @@ SOURCES += tst_qdeclarativedebugclient.cpp \ CONFIG += declarative_debug -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro index 0bdc8769ad..0e9b76b4f1 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro +++ b/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += declarative network script declarative-private +CONFIG += testcase +TARGET = tst_qdeclarativedebugjs +QT += network script declarative-private testlib macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro index 999e19279b..c23e9204f7 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro +++ b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += network declarative +CONFIG += testcase +TARGET = tst_qdeclarativedebugservice macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h @@ -8,4 +8,4 @@ SOURCES += tst_qdeclarativedebugservice.cpp \ CONFIG += parallel_test declarative_debug -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index 1c795f3cdd..77254c0bb6 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative network widgets +CONFIG += testcase +TARGET = tst_qdeclarativeecmascript macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ @@ -17,4 +17,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private network widgets testlib diff --git a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro index b6015137c7..6e65716637 100644 --- a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro +++ b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative network +CONFIG += testcase +TARGET = tst_qdeclarativeengine macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeengine.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro b/tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro index acf62acaf9..98736c6628 100644 --- a/tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro +++ b/tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += network declarative +CONFIG += testcase +TARGET = tst_qdeclarativeenginedebug macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h @@ -8,4 +8,4 @@ SOURCES += tst_qdeclarativeenginedebug.cpp \ CONFIG += parallel_test declarative_debug -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro index 80a517d6c6..b24c97e68e 100644 --- a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro +++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativeerror SOURCES += tst_qdeclarativeerror.cpp macx:CONFIG -= app_bundle @@ -7,4 +7,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro b/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro index 8659645d3e..b4a9394a7a 100644 --- a/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro +++ b/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativeexpression macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeexpression.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro index 4d878a3ea6..38ce205670 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativefolderlistmodel macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativefolderlistmodel.cpp @@ -7,4 +7,4 @@ SOURCES += tst_qdeclarativefolderlistmodel.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro index 758f446eb2..c0cf19a994 100644 --- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network +CONFIG += testcase +TARGET = tst_qdeclarativefontloader macx:CONFIG -= app_bundle HEADERS += ../../declarative/shared/testhttpserver.h @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro index 834a95cae6..8c13e1ca9e 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro +++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative -QT += network +CONFIG += testcase +TARGET = tst_qdeclarativeimageprovider macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeimageprovider.cpp @@ -12,4 +11,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro b/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro index 35776a6889..a95c8c4226 100644 --- a/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro +++ b/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative network widgets +CONFIG += testcase +TARGET = tst_qdeclarativeincubator macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeincubator.cpp \ @@ -10,4 +10,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private network widgets testlib diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro index 52fbef7dae..6f1f1c897c 100644 --- a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro +++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative widgets +CONFIG += testcase +TARGET = tst_qdeclarativeinfo macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeinfo.cpp @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private widgets testlib diff --git a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro index 18f6d51f34..771f27cd3f 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro +++ b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativeinstruction SOURCES += tst_qdeclarativeinstruction.cpp macx:CONFIG -= app_bundle @@ -7,4 +7,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro index 638a035deb..105e2b44d6 100644 --- a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro +++ b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative -QT += network +CONFIG += testcase +TARGET = tst_qdeclarativelanguage macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelanguage.cpp \ @@ -16,4 +15,4 @@ importFiles.path = . DEPLOYMENT += importFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro b/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro index e3988b33cb..e3e83d184e 100644 --- a/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro +++ b/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativelistcompositor macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelistcompositor.cpp @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro index fbf02e2230..1586e68281 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativelistmodel macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelistmodel.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro index 03affbf482..683ea7bf5e 100644 --- a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro +++ b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro @@ -1,9 +1,9 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativelistreference macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelistreference.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro index b7a6a00f7e..ab33876a91 100644 --- a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro +++ b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative widgets +CONFIG += testcase +TARGET = tst_qdeclarativemetatype SOURCES += tst_qdeclarativemetatype.cpp macx:CONFIG -= app_bundle @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private widgets testlib diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro index efce8faa8e..6ae085caad 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro @@ -1,11 +1,11 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdeclarativemoduleplugin HEADERS = ../shared/testhttpserver.h SOURCES = tst_qdeclarativemoduleplugin.cpp \ ../shared/testhttpserver.cpp -QT += declarative network CONFIG -= app_bundle DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro b/tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro index 20c5b27ec4..4c2e3a8466 100644 --- a/tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro +++ b/tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativepath macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepath.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index e5dfbe505d..79d411c62c 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative -QT += network +CONFIG += testcase +TARGET = tst_qdeclarativepixmapcache macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepixmapcache.cpp @@ -18,4 +17,4 @@ DEPLOYMENT += importFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro index 87b3151718..a12c057d2f 100644 --- a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro +++ b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative widgets +CONFIG += testcase +TARGET = tst_qdeclarativeproperty macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeproperty.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private widgets testlib diff --git a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro index 505058b1af..a6332161a0 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro +++ b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro @@ -1,9 +1,9 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativepropertymap macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepropertymap.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 94d2332bde..1b8bf3f790 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativeqt SOURCES += tst_qdeclarativeqt.cpp macx:CONFIG -= app_bundle @@ -10,4 +10,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro b/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro index 2f86a87001..14891a6751 100644 --- a/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro +++ b/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativescriptdebugging macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativescriptdebugging.cpp @@ -12,4 +12,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index 3eaf140c47..f6d2c6aab3 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativesmoothedanimation macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesmoothedanimation.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro index c37169f52d..63087660d1 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativespringanimation macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativespringanimation.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro index 933169319b..014e8aa708 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative -QT += sql +CONFIG += testcase +TARGET = tst_qdeclarativesqldatabase macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesqldatabase.cpp @@ -9,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private sql testlib diff --git a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro index 8022ef7b4b..7383fd49a0 100644 --- a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativestates macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativestates.cpp @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro index e8e75fb3ff..f329897e0c 100644 --- a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro +++ b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative -QT += network +CONFIG += testcase +TARGET = tst_qdeclarativestyledtext macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativestyledtext.cpp @@ -9,4 +8,4 @@ SOURCES += tst_qdeclarativestyledtext.cpp # LIBS += -lgcov CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro index 879040ce64..808459db8a 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro +++ b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui widgets +CONFIG += testcase +TARGET = tst_qdeclarativesystempalette macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesystempalette.cpp @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private widgets testlib diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro index 66aba261c3..93f73abf16 100644 --- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qdeclarativetimer macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetimer.cpp @@ -7,4 +7,4 @@ SOURCES += tst_qdeclarativetimer.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private gui testlib diff --git a/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro b/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro index 0a30d0cfec..edccaaecc4 100644 --- a/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro +++ b/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativetranslation macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetranslation.cpp @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro b/tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro index fa9737f217..6021dc941d 100644 --- a/tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro +++ b/tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative network +CONFIG += testcase +TARGET = tst_qdeclarativev4 macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativev4.cpp \ @@ -10,4 +10,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro index e2acf4a3fa..80e6ee9125 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro +++ b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativevaluetypes macx:CONFIG -= app_bundle HEADERS += testtypes.h @@ -11,4 +11,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += insignificant_test parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro index 31013f5c4f..721c4191f9 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro +++ b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qdeclarativeworkerscript macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeworkerscript.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private testlib diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index fa4f678ade..d8a59a103c 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative network +CONFIG += testcase +TARGET = tst_qdeclarativexmlhttprequest macx:CONFIG -= app_bundle INCLUDEPATH += ../shared/ @@ -12,4 +12,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index 0c15299b83..ab850ddf22 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network +CONFIG += testcase +TARGET = tst_qdeclarativexmllistmodel contains(QT_CONFIG,xmlpatterns) { QT += xmlpatterns DEFINES += QTEST_XMLPATTERNS @@ -12,4 +12,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private network testlib diff --git a/tests/auto/declarative/qjsengine/qjsengine.pro b/tests/auto/declarative/qjsengine/qjsengine.pro index 0a12e22450..5696ef845a 100644 --- a/tests/auto/declarative/qjsengine/qjsengine.pro +++ b/tests/auto/declarative/qjsengine/qjsengine.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += declarative widgets +CONFIG += testcase +TARGET = tst_qjsengine +QT += declarative widgets testlib macx:CONFIG -= app_bundle SOURCES += tst_qjsengine.cpp #temporary diff --git a/tests/auto/declarative/qjsvalue/qjsvalue.pro b/tests/auto/declarative/qjsvalue/qjsvalue.pro index caa148f86d..36ce0024c2 100644 --- a/tests/auto/declarative/qjsvalue/qjsvalue.pro +++ b/tests/auto/declarative/qjsvalue/qjsvalue.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += declarative widgets +CONFIG += testcase +TARGET = tst_qjsvalue +QT += declarative widgets testlib SOURCES += tst_qjsvalue.cpp HEADERS += tst_qjsvalue.h diff --git a/tests/auto/declarative/qjsvalueiterator/qjsvalueiterator.pro b/tests/auto/declarative/qjsvalueiterator/qjsvalueiterator.pro index e5137fcdf1..a705858ade 100644 --- a/tests/auto/declarative/qjsvalueiterator/qjsvalueiterator.pro +++ b/tests/auto/declarative/qjsvalueiterator/qjsvalueiterator.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core declarative +CONFIG += testcase +TARGET = tst_qjsvalueiterator +QT = core declarative testlib SOURCES += tst_qjsvalueiterator.cpp diff --git a/tests/auto/declarative/qmetaobjectbuilder/qmetaobjectbuilder.pro b/tests/auto/declarative/qmetaobjectbuilder/qmetaobjectbuilder.pro index 15a4e76aa6..047a871496 100644 --- a/tests/auto/declarative/qmetaobjectbuilder/qmetaobjectbuilder.pro +++ b/tests/auto/declarative/qmetaobjectbuilder/qmetaobjectbuilder.pro @@ -1,9 +1,9 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qmetaobjectbuilder macx:CONFIG -= app_bundle SOURCES += \ tst_qmetaobjectbuilder.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qmlmin/qmlmin.pro b/tests/auto/declarative/qmlmin/qmlmin.pro index 83c11b4934..61d2330b06 100644 --- a/tests/auto/declarative/qmlmin/qmlmin.pro +++ b/tests/auto/declarative/qmlmin/qmlmin.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qmlmin +QT += declarative testlib macx:CONFIG -= app_bundle SOURCES += tst_qmlmin.cpp diff --git a/tests/auto/declarative/qmlplugindump/qmlplugindump.pro b/tests/auto/declarative/qmlplugindump/qmlplugindump.pro index ce0a566ea4..498a520873 100644 --- a/tests/auto/declarative/qmlplugindump/qmlplugindump.pro +++ b/tests/auto/declarative/qmlplugindump/qmlplugindump.pro @@ -1,4 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmlplugindump +QT += testlib macx:CONFIG -= app_bundle CONFIG += parallel_test diff --git a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro index 1c2130d5cf..076ab98505 100644 --- a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro +++ b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += network declarative +CONFIG += testcase +TARGET = tst_qpacketprotocol macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h @@ -7,4 +7,4 @@ SOURCES += tst_qpacketprotocol.cpp \ ../shared/debugutil.cpp CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private network testlib diff --git a/tests/auto/declarative/qsganimatedimage/qsganimatedimage.pro b/tests/auto/declarative/qsganimatedimage/qsganimatedimage.pro index ae0eb0c1aa..213d7efdb5 100644 --- a/tests/auto/declarative/qsganimatedimage/qsganimatedimage.pro +++ b/tests/auto/declarative/qsganimatedimage/qsganimatedimage.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative network +CONFIG += testcase +TARGET = tst_qsganimatedimage HEADERS += ../shared/testhttpserver.h SOURCES += tst_qsganimatedimage.cpp ../shared/testhttpserver.cpp macx:CONFIG -= app_bundle @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro index c6101ef3d6..115227487e 100644 --- a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro +++ b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsgborderimage macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h @@ -8,6 +9,6 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private network widgets +QT += core-private gui-private declarative-private network widgets testlib qpa:CONFIG+=insignificant_test # QTBUG-21004 fails, unstably diff --git a/tests/auto/declarative/qsgcanvas/qsgcanvas.pro b/tests/auto/declarative/qsgcanvas/qsgcanvas.pro index 9fe5dd9194..d8749112d5 100644 --- a/tests/auto/declarative/qsgcanvas/qsgcanvas.pro +++ b/tests/auto/declarative/qsgcanvas/qsgcanvas.pro @@ -1,8 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgcanvas SOURCES += tst_qsgcanvas.cpp macx:CONFIG -= app_bundle CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qsgflickable/qsgflickable.pro b/tests/auto/declarative/qsgflickable/qsgflickable.pro index 36166a21cb..15656d200a 100644 --- a/tests/auto/declarative/qsgflickable/qsgflickable.pro +++ b/tests/auto/declarative/qsgflickable/qsgflickable.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qsgflickable macx:CONFIG -= app_bundle SOURCES += tst_qsgflickable.cpp @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private testlib diff --git a/tests/auto/declarative/qsgflipable/qsgflipable.pro b/tests/auto/declarative/qsgflipable/qsgflipable.pro index 91488b9249..82816bf832 100644 --- a/tests/auto/declarative/qsgflipable/qsgflipable.pro +++ b/tests/auto/declarative/qsgflipable/qsgflipable.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qsgflipable macx:CONFIG -= app_bundle SOURCES += tst_qsgflipable.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private testlib diff --git a/tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro b/tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro index b07b1cb7a9..279e11b0a9 100644 --- a/tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro +++ b/tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro @@ -1,10 +1,10 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgfocusscope SOURCES += tst_qsgfocusscope.cpp macx:CONFIG -= app_bundle DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-21054, unstable diff --git a/tests/auto/declarative/qsggridview/qsggridview.pro b/tests/auto/declarative/qsggridview/qsggridview.pro index 35c4f6f526..182b553e22 100644 --- a/tests/auto/declarative/qsggridview/qsggridview.pro +++ b/tests/auto/declarative/qsggridview/qsggridview.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsggridview macx:CONFIG -= app_bundle SOURCES += tst_qsggridview.cpp @@ -9,5 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private -QT += opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qsgimage/qsgimage.pro b/tests/auto/declarative/qsgimage/qsgimage.pro index 704cfb913c..4127fe48be 100644 --- a/tests/auto/declarative/qsgimage/qsgimage.pro +++ b/tests/auto/declarative/qsgimage/qsgimage.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network +CONFIG += testcase +TARGET = tst_qsgimage macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h @@ -10,4 +10,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qsgitem/qsgitem.pro b/tests/auto/declarative/qsgitem/qsgitem.pro index 314491c798..76d6547da7 100644 --- a/tests/auto/declarative/qsgitem/qsgitem.pro +++ b/tests/auto/declarative/qsgitem/qsgitem.pro @@ -1,8 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgitem SOURCES += tst_qsgitem.cpp macx:CONFIG -= app_bundle CONFIG += parallel_test -QT += core-private gui-private declarative-private widgets +QT += core-private gui-private declarative-private widgets testlib diff --git a/tests/auto/declarative/qsgitem2/qsgitem.pro b/tests/auto/declarative/qsgitem2/qsgitem.pro index ae8413ea2e..dd7fc38c48 100644 --- a/tests/auto/declarative/qsgitem2/qsgitem.pro +++ b/tests/auto/declarative/qsgitem2/qsgitem.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qsgitem macx:CONFIG -= app_bundle SOURCES += tst_qsgitem.cpp @@ -8,5 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private -QT += opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qsglistview/qsglistview.pro b/tests/auto/declarative/qsglistview/qsglistview.pro index 173ce92752..3c19a8d88f 100644 --- a/tests/auto/declarative/qsglistview/qsglistview.pro +++ b/tests/auto/declarative/qsglistview/qsglistview.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsglistview macx:CONFIG -= app_bundle HEADERS += incrementalmodel.h @@ -8,5 +8,4 @@ SOURCES += tst_qsglistview.cpp incrementalmodel.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += insignificant_test parallel_test -QT += core-private gui-private declarative-private widgets widgets-private v8-private -QT += opengl-private +QT += core-private gui-private declarative-private widgets widgets-private v8-private opengl-private testlib diff --git a/tests/auto/declarative/qsgloader/qsgloader.pro b/tests/auto/declarative/qsgloader/qsgloader.pro index 24b597d277..fd18bef181 100644 --- a/tests/auto/declarative/qsgloader/qsgloader.pro +++ b/tests/auto/declarative/qsgloader/qsgloader.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network +CONFIG += testcase +TARGET = tst_qsgloader macx:CONFIG -= app_bundle INCLUDEPATH += ../shared/ @@ -11,4 +11,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qsgmousearea/qsgmousearea.pro b/tests/auto/declarative/qsgmousearea/qsgmousearea.pro index 26f5413793..47536ad6c5 100644 --- a/tests/auto/declarative/qsgmousearea/qsgmousearea.pro +++ b/tests/auto/declarative/qsgmousearea/qsgmousearea.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network +CONFIG += testcase +TARGET = tst_qsgmousearea macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qsgpathview/qsgpathview.pro b/tests/auto/declarative/qsgpathview/qsgpathview.pro index 52d670e171..902d624417 100644 --- a/tests/auto/declarative/qsgpathview/qsgpathview.pro +++ b/tests/auto/declarative/qsgpathview/qsgpathview.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsgpathview macx:CONFIG -= app_bundle SOURCES += tst_qsgpathview.cpp @@ -8,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private widgets +QT += core-private gui-private v8-private declarative-private widgets testlib diff --git a/tests/auto/declarative/qsgpincharea/qsgpincharea.pro b/tests/auto/declarative/qsgpincharea/qsgpincharea.pro index 078baebb5c..86b1110909 100644 --- a/tests/auto/declarative/qsgpincharea/qsgpincharea.pro +++ b/tests/auto/declarative/qsgpincharea/qsgpincharea.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qsgpincharea macx:CONFIG -= app_bundle SOURCES += tst_qsgpincharea.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qsgpositioners/qsgpositioners.pro b/tests/auto/declarative/qsgpositioners/qsgpositioners.pro index 5a365a1252..cd9e7a0094 100644 --- a/tests/auto/declarative/qsgpositioners/qsgpositioners.pro +++ b/tests/auto/declarative/qsgpositioners/qsgpositioners.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgpositioners SOURCES += tst_qsgpositioners.cpp macx:CONFIG -= app_bundle @@ -8,5 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private -QT += opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qsgrepeater/qsgrepeater.pro b/tests/auto/declarative/qsgrepeater/qsgrepeater.pro index aa6e44d8ab..aa15c71f8c 100644 --- a/tests/auto/declarative/qsgrepeater/qsgrepeater.pro +++ b/tests/auto/declarative/qsgrepeater/qsgrepeater.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgrepeater macx:CONFIG -= app_bundle SOURCES += tst_qsgrepeater.cpp @@ -9,4 +9,4 @@ testFiles.path = . DEPLOYMENT += testFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qsgtext/qsgtext.pro b/tests/auto/declarative/qsgtext/qsgtext.pro index 696b12198b..b60df65e74 100644 --- a/tests/auto/declarative/qsgtext/qsgtext.pro +++ b/tests/auto/declarative/qsgtext/qsgtext.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui -QT += network +CONFIG += testcase +TARGET = tst_qsgtext macx:CONFIG -= app_bundle SOURCES += tst_qsgtext.cpp @@ -13,5 +12,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += insignificant_test parallel_test -QT += core-private gui-private v8-private declarative-private widgets-private -QT += opengl-private +QT += core-private gui-private v8-private declarative-private widgets-private opengl-private network testlib diff --git a/tests/auto/declarative/qsgtextedit/qsgtextedit.pro b/tests/auto/declarative/qsgtextedit/qsgtextedit.pro index a205f13480..0434d76d9f 100644 --- a/tests/auto/declarative/qsgtextedit/qsgtextedit.pro +++ b/tests/auto/declarative/qsgtextedit/qsgtextedit.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network widgets widgets-private +CONFIG += testcase +TARGET = tst_qsgtextedit macx:CONFIG -= app_bundle SOURCES += tst_qsgtextedit.cpp ../shared/testhttpserver.cpp @@ -7,5 +7,4 @@ HEADERS += ../shared/testhttpserver.h DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private v8-private declarative-private -QT += opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private network widgets-private testlib diff --git a/tests/auto/declarative/qsgtextinput/qsgtextinput.pro b/tests/auto/declarative/qsgtextinput/qsgtextinput.pro index ae4c9ef41f..b949247c7d 100644 --- a/tests/auto/declarative/qsgtextinput/qsgtextinput.pro +++ b/tests/auto/declarative/qsgtextinput/qsgtextinput.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qsgtextinput macx:CONFIG -= app_bundle SOURCES += tst_qsgtextinput.cpp @@ -7,5 +7,4 @@ SOURCES += tst_qsgtextinput.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private -QT += opengl-private +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qsgview/qsgview.pro b/tests/auto/declarative/qsgview/qsgview.pro index f47eed15e0..cd6a70fef6 100644 --- a/tests/auto/declarative/qsgview/qsgview.pro +++ b/tests/auto/declarative/qsgview/qsgview.pro @@ -1,9 +1,9 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui +CONFIG += testcase +TARGET = tst_qsgview macx:CONFIG -= app_bundle SOURCES += tst_qsgview.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private testlib diff --git a/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro b/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro index 6a999d8793..ad5f4f32de 100644 --- a/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro +++ b/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsgvisualdatamodel macx:CONFIG -= app_bundle SOURCES += tst_qsgvisualdatamodel.cpp @@ -7,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private widgets +QT += core-private gui-private v8-private declarative-private widgets testlib |