From 47e1b91b47dcf59dbeff2740add94ceda188c6bc Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 11 Oct 2011 15:14:05 +1000 Subject: [PATCH] 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 Reviewed-by: Jason McDonald --- tests/auto/declarative/examples/examples.pro | 6 +++--- tests/auto/declarative/geometry/geometry.pro | 6 ++---- tests/auto/declarative/nodes/nodes.pro | 6 ++---- tests/auto/declarative/parserstress/parserstress.pro | 6 +++--- .../declarative/qdeclarativeanimations/qdeclarativeanimations.pro | 6 +++--- .../qdeclarativeapplication/qdeclarativeapplication.pro | 6 +++--- .../declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro | 6 +++--- .../auto/declarative/qdeclarativebinding/qdeclarativebinding.pro | 6 +++--- .../declarative/qdeclarativechangeset/qdeclarativechangeset.pro | 6 +++--- .../declarative/qdeclarativecomponent/qdeclarativecomponent.pro | 7 +++---- .../declarative/qdeclarativeconnection/qdeclarativeconnection.pro | 6 +++--- .../auto/declarative/qdeclarativecontext/qdeclarativecontext.pro | 6 +++--- .../declarative/qdeclarativecpputils/qdeclarativecpputils.pro | 6 +++--- .../qdeclarativedebugclient/qdeclarativedebugclient.pro | 6 +++--- .../auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro | 5 +++-- .../qdeclarativedebugservice/qdeclarativedebugservice.pro | 6 +++--- .../declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro | 6 +++--- tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro | 6 +++--- .../qdeclarativeenginedebug/qdeclarativeenginedebug.pro | 6 +++--- tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro | 6 +++--- .../declarative/qdeclarativeexpression/qdeclarativeexpression.pro | 6 +++--- .../qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro | 6 +++--- .../declarative/qdeclarativefontloader/qdeclarativefontloader.pro | 6 +++--- .../qdeclarativeimageprovider/qdeclarativeimageprovider.pro | 7 +++---- .../declarative/qdeclarativeincubator/qdeclarativeincubator.pro | 6 +++--- tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro | 6 +++--- .../qdeclarativeinstruction/qdeclarativeinstruction.pro | 6 +++--- .../declarative/qdeclarativelanguage/qdeclarativelanguage.pro | 7 +++---- .../qdeclarativelistcompositor/qdeclarativelistcompositor.pro | 6 +++--- .../declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro | 6 +++--- .../qdeclarativelistreference/qdeclarativelistreference.pro | 6 +++--- .../declarative/qdeclarativemetatype/qdeclarativemetatype.pro | 6 +++--- .../qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro | 6 +++--- tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro | 6 +++--- .../qdeclarativepixmapcache/qdeclarativepixmapcache.pro | 7 +++---- .../declarative/qdeclarativeproperty/qdeclarativeproperty.pro | 6 +++--- .../qdeclarativepropertymap/qdeclarativepropertymap.pro | 6 +++--- tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro | 6 +++--- .../qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro | 6 +++--- .../qdeclarativesmoothedanimation.pro | 6 +++--- .../qdeclarativespringanimation/qdeclarativespringanimation.pro | 6 +++--- .../qdeclarativesqldatabase/qdeclarativesqldatabase.pro | 7 +++---- tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro | 6 +++--- .../declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro | 7 +++---- .../qdeclarativesystempalette/qdeclarativesystempalette.pro | 6 +++--- tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro | 6 +++--- .../qdeclarativetranslation/qdeclarativetranslation.pro | 6 +++--- tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro | 6 +++--- .../declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro | 6 +++--- .../qdeclarativeworkerscript/qdeclarativeworkerscript.pro | 6 +++--- .../qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro | 6 +++--- .../qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro | 6 +++--- tests/auto/declarative/qjsengine/qjsengine.pro | 5 +++-- tests/auto/declarative/qjsvalue/qjsvalue.pro | 5 +++-- tests/auto/declarative/qjsvalueiterator/qjsvalueiterator.pro | 5 +++-- tests/auto/declarative/qmetaobjectbuilder/qmetaobjectbuilder.pro | 6 +++--- tests/auto/declarative/qmlmin/qmlmin.pro | 5 +++-- tests/auto/declarative/qmlplugindump/qmlplugindump.pro | 4 +++- tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro | 6 +++--- tests/auto/declarative/qsganimatedimage/qsganimatedimage.pro | 6 +++--- tests/auto/declarative/qsgborderimage/qsgborderimage.pro | 5 +++-- tests/auto/declarative/qsgcanvas/qsgcanvas.pro | 6 +++--- tests/auto/declarative/qsgflickable/qsgflickable.pro | 6 +++--- tests/auto/declarative/qsgflipable/qsgflipable.pro | 6 +++--- tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro | 6 +++--- tests/auto/declarative/qsggridview/qsggridview.pro | 7 +++---- tests/auto/declarative/qsgimage/qsgimage.pro | 6 +++--- tests/auto/declarative/qsgitem/qsgitem.pro | 6 +++--- tests/auto/declarative/qsgitem2/qsgitem.pro | 7 +++---- tests/auto/declarative/qsglistview/qsglistview.pro | 7 +++---- tests/auto/declarative/qsgloader/qsgloader.pro | 6 +++--- tests/auto/declarative/qsgmousearea/qsgmousearea.pro | 6 +++--- tests/auto/declarative/qsgpathview/qsgpathview.pro | 5 +++-- tests/auto/declarative/qsgpincharea/qsgpincharea.pro | 6 +++--- tests/auto/declarative/qsgpositioners/qsgpositioners.pro | 7 +++---- tests/auto/declarative/qsgrepeater/qsgrepeater.pro | 6 +++--- tests/auto/declarative/qsgtext/qsgtext.pro | 8 +++----- tests/auto/declarative/qsgtextedit/qsgtextedit.pro | 7 +++---- tests/auto/declarative/qsgtextinput/qsgtextinput.pro | 7 +++---- tests/auto/declarative/qsgview/qsgview.pro | 6 +++--- tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro | 5 +++-- tests/auto/headersclean/headersclean.pro | 5 +++-- tests/auto/particles/qsgage/qsgage.pro | 6 +++--- tests/auto/particles/qsgangleddirection/qsgangleddirection.pro | 6 +++--- .../particles/qsgcumulativedirection/qsgcumulativedirection.pro | 6 +++--- tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro | 6 +++--- tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro | 6 +++--- tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro | 6 +++--- tests/auto/particles/qsgfriction/qsgfriction.pro | 6 +++--- tests/auto/particles/qsggravity/qsggravity.pro | 6 +++--- tests/auto/particles/qsgimageparticle/qsgimageparticle.pro | 6 +++--- tests/auto/particles/qsgitemparticle/qsgitemparticle.pro | 6 +++--- tests/auto/particles/qsglineextruder/qsglineextruder.pro | 6 +++--- tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro | 6 +++--- tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro | 6 +++--- tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro | 6 +++--- tests/auto/particles/qsgpointattractor/qsgpointattractor.pro | 6 +++--- tests/auto/particles/qsgpointdirection/qsgpointdirection.pro | 6 +++--- .../auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro | 6 +++--- tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro | 6 +++--- tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro | 6 +++--- tests/auto/particles/qsgturbulence/qsgturbulence.pro | 6 +++--- tests/auto/particles/qsgwander/qsgwander.pro | 6 +++--- tests/auto/qmldevtools/compile/compile.pro | 5 +++-- tests/auto/qtquick1/examples/examples.pro | 6 +++--- tests/auto/qtquick1/moduleqt47/moduleqt47.pro | 6 +++--- tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro | 6 +++--- .../qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro | 6 +++--- .../qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro | 6 +++--- .../qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro | 6 +++--- .../auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro | 6 +++--- tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro | 6 +++--- .../qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro | 6 +++--- .../qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro | 6 +++--- tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro | 6 +++--- .../qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro | 6 +++--- .../qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro | 6 +++--- tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro | 6 +++--- tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro | 6 +++--- .../qdeclarativeimageprovider/qdeclarativeimageprovider.pro | 7 +++---- tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro | 6 +++--- .../qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro | 6 +++--- .../auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro | 6 +++--- tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro | 6 +++--- tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro | 6 +++--- .../auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro | 6 +++--- .../auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro | 6 +++--- tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro | 6 +++--- .../auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro | 6 +++--- .../qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro | 6 +++--- tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro | 6 +++--- .../qdeclarativesmoothedanimation.pro | 6 +++--- .../qdeclarativespringanimation/qdeclarativespringanimation.pro | 6 +++--- tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro | 6 +++--- .../qdeclarativesystempalette/qdeclarativesystempalette.pro | 6 +++--- tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro | 7 +++---- tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro | 6 +++--- .../auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro | 6 +++--- tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro | 6 +++--- tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro | 6 +++--- tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro | 6 +++--- .../qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro | 6 +++--- .../qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro | 6 +++--- tests/benchmarks/declarative/binding/binding.pro | 4 ++-- tests/benchmarks/declarative/compilation/compilation.pro | 4 ++-- tests/benchmarks/declarative/creation/creation.pro | 5 ++--- tests/benchmarks/declarative/holistic/holistic.pro | 4 ++-- tests/benchmarks/declarative/javascript/javascript.pro | 4 ++-- tests/benchmarks/declarative/js/qjsengine/qjsengine.pro | 4 ++-- tests/benchmarks/declarative/js/qjsvalue/qjsvalue.pro | 4 ++-- .../declarative/js/qjsvalueiterator/qjsvalueiterator.pro | 4 ++-- tests/benchmarks/declarative/pointers/pointers.pro | 4 ++-- .../declarative/qdeclarativecomponent/qdeclarativecomponent.pro | 4 ++-- .../declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro | 4 ++-- .../declarative/qdeclarativeimage/qdeclarativeimage.pro | 4 ++-- .../qdeclarativemetaproperty/qdeclarativemetaproperty.pro | 4 ++-- tests/benchmarks/declarative/qmltime/qmltime.pro | 4 ++-- tests/benchmarks/declarative/script/script.pro | 4 ++-- tests/benchmarks/declarative/typeimports/typeimports.pro | 4 ++-- 159 files changed, 459 insertions(+), 468 deletions(-) diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index edd4d80..e68a93c 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 71d226d..a66399a 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 8fda2f6..b622c6a 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 a2e4479..44dc52c 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 58ed934..f4231b5 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 4dbffa9..3564f40 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 b347b1e..7a2fdd4 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 8bc8b6c..f2fd7ae 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 a8fac10..f5ab4c6 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 05a006b..156512e 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 0fa1ebc..e2b814d 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 8fdd325..86bec2f 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 aa7ca09..3cae5c2 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 28e25e9..850a0d4 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 0bdc876..0e9b76b 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 999e192..c23e920 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 1c795f3..77254c0 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 b601513..6e65716 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 acf62ac..98736c6 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 80a517d..b24c97e 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 8659645..b4a9394 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 4d878a3..38ce205 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 758f446..c0cf19a 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 834a95c..8c13e1c 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 35776a6..a95c8c4 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 52fbef7..6f1f1c8 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 18f6d51..771f27c 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 638a035..105e2b4 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 e3988b3..e3e83d1 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 fbf02e2..1586e68 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 03affbf..683ea7b 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 b7a6a00..ab33876 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 efce8fa..6ae085c 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 20c5b27..4c2e3a8 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 e5dfbe5..79d411c 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 87b3151..a12c057 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 505058b..a633216 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 94d2332..1b8bf3f 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 2f86a87..14891a6 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 3eaf140..f6d2c6a 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 c37169f..6308766 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 9331693..014e8aa 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 8022ef7..7383fd4 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 e8e75fb..f329897 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 879040c..808459d 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 66aba26..93f73ab 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 0a30d0c..edccaae 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 fa9737f..6021dc9 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 e2acf4a..80e6ee9 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 31013f5..721c419 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 fa4f678..d8a59a1 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 0c15299..ab850dd 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 0a12e22..5696ef8 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 caa148f..36ce002 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 e5137fc..a705858 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 15a4e76..047a871 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 83c11b4..61d2330 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 ce0a566..498a520 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 1c2130d..076ab98 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 ae0eb0c..213d7ef 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 c6101ef..1152274 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 9fe5dd9..d874911 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 36166a2..15656d2 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 91488b9..82816bf 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 b07b1cb..279e11b 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 35c4f6f..182b553 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 704cfb9..4127fe4 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 314491c..76d6547 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 ae8413e..dd7fc38 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 173ce92..3c19a8d 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 24b597d..fd18bef 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 26f5413..47536ad 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 52d670e..902d624 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 078baeb..86b1110 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 5a365a1..cd9e7a0 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 aa6e44d..aa15c71 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 696b121..b60df65 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 a205f13..0434d76 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 ae4c9ef..b949247 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 f47eed1..cd6a70f 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 6a999d8..ad5f4f3 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 diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index c9522f9..16802b7 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_headersclean SOURCES += tst_headersclean.cpp -QT = core +QT = core testlib contains(QT_CONFIG,declarative): QT += declarative declarative-private diff --git a/tests/auto/particles/qsgage/qsgage.pro b/tests/auto/particles/qsgage/qsgage.pro index bdcf720..e4904c8 100644 --- a/tests/auto/particles/qsgage/qsgage.pro +++ b/tests/auto/particles/qsgage/qsgage.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgage SOURCES += tst_qsgage.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgangleddirection/qsgangleddirection.pro b/tests/auto/particles/qsgangleddirection/qsgangleddirection.pro index d58fe4b..e22706e 100644 --- a/tests/auto/particles/qsgangleddirection/qsgangleddirection.pro +++ b/tests/auto/particles/qsgangleddirection/qsgangleddirection.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgangleddirection SOURCES += tst_qsgangleddirection.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgcumulativedirection/qsgcumulativedirection.pro b/tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro index f069178..c1151a1 100644 --- a/tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro +++ b/tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgcumulativedirection SOURCES += tst_qsgcumulativedirection.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgcustomaffector/qsgcustomaffector.pro b/tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro index 3365ef1..7af77e8 100644 --- a/tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro +++ b/tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgcustomaffector SOURCES += tst_qsgcustomaffector.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgcustomparticle/qsgcustomparticle.pro b/tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro index 313c84c..76866a1 100644 --- a/tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro +++ b/tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgcustomparticle SOURCES += tst_qsgcustomparticle.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgellipseextruder/qsgellipseextruder.pro b/tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro index 403606c..6cf3b43 100644 --- a/tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro +++ b/tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgellipseextruder SOURCES += tst_qsgellipseextruder.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgfriction/qsgfriction.pro b/tests/auto/particles/qsgfriction/qsgfriction.pro index 6288612..e914fee 100644 --- a/tests/auto/particles/qsgfriction/qsgfriction.pro +++ b/tests/auto/particles/qsgfriction/qsgfriction.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgfriction SOURCES += tst_qsgfriction.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsggravity/qsggravity.pro b/tests/auto/particles/qsggravity/qsggravity.pro index f60e351..68f6203 100644 --- a/tests/auto/particles/qsggravity/qsggravity.pro +++ b/tests/auto/particles/qsggravity/qsggravity.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsggravity SOURCES += tst_qsggravity.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgimageparticle/qsgimageparticle.pro b/tests/auto/particles/qsgimageparticle/qsgimageparticle.pro index 592be21..4e36e06 100644 --- a/tests/auto/particles/qsgimageparticle/qsgimageparticle.pro +++ b/tests/auto/particles/qsgimageparticle/qsgimageparticle.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgimageparticle SOURCES += tst_qsgimageparticle.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgitemparticle/qsgitemparticle.pro b/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro index fd75e25..49729ac 100644 --- a/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro +++ b/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgitemparticle SOURCES += tst_qsgitemparticle.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsglineextruder/qsglineextruder.pro b/tests/auto/particles/qsglineextruder/qsglineextruder.pro index 78ab2eb..00d61d8 100644 --- a/tests/auto/particles/qsglineextruder/qsglineextruder.pro +++ b/tests/auto/particles/qsglineextruder/qsglineextruder.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsglineextruder SOURCES += tst_qsglineextruder.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgmaskextruder/qsgmaskextruder.pro b/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro index 50076db..a60d3da 100644 --- a/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro +++ b/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgmaskextruder SOURCES += tst_qsgmaskextruder.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgparticlegroup/qsgparticlegroup.pro b/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro index 4f51a09..1376ab8 100644 --- a/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro +++ b/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgparticlegroup SOURCES += tst_qsgparticlegroup.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgparticlesystem/qsgparticlesystem.pro b/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro index 0393ce0..8137829 100644 --- a/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro +++ b/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgparticlesystem SOURCES += tst_qsgparticlesystem.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgpointattractor/qsgpointattractor.pro b/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro index 9bdcfa1..03d0de6 100644 --- a/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro +++ b/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgpointattractor SOURCES += tst_qsgpointattractor.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgpointdirection/qsgpointdirection.pro b/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro index 8e5a1be..4d2f2bf 100644 --- a/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro +++ b/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgpointdirection SOURCES += tst_qsgpointdirection.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgrectangleextruder/qsgrectangleextruder.pro b/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro index 7cf10ca..8180dbf 100644 --- a/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro +++ b/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgrectangleextruder SOURCES += tst_qsgrectangleextruder.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgtargetdirection/qsgtargetdirection.pro b/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro index 71996a0..f6016be 100644 --- a/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro +++ b/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgtargetdirection SOURCES += tst_qsgtargetdirection.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgtrailemitter/qsgtrailemitter.pro b/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro index a695d5c..bae358e 100644 --- a/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro +++ b/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgtrailemitter SOURCES += tst_qsgtrailemitter.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgturbulence/qsgturbulence.pro b/tests/auto/particles/qsgturbulence/qsgturbulence.pro index e38d21b..ffec48f 100644 --- a/tests/auto/particles/qsgturbulence/qsgturbulence.pro +++ b/tests/auto/particles/qsgturbulence/qsgturbulence.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgturbulence SOURCES += tst_qsgturbulence.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/particles/qsgwander/qsgwander.pro b/tests/auto/particles/qsgwander/qsgwander.pro index cf9d88c..7ea187b 100644 --- a/tests/auto/particles/qsgwander/qsgwander.pro +++ b/tests/auto/particles/qsgwander/qsgwander.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_qsgwander SOURCES += tst_qsgwander.cpp macx:CONFIG -= app_bundle @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles 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/qmldevtools/compile/compile.pro b/tests/auto/qmldevtools/compile/compile.pro index 9fe2216..7cb01d7 100644 --- a/tests/auto/qmldevtools/compile/compile.pro +++ b/tests/auto/qmldevtools/compile/compile.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core qmldevtools-private +CONFIG += testcase +TARGET = tst_compile +QT = core qmldevtools-private testlib macx:CONFIG -= app_bundle SOURCES += tst_compile.cpp diff --git a/tests/auto/qtquick1/examples/examples.pro b/tests/auto/qtquick1/examples/examples.pro index ab1d897..ca4ad04 100644 --- a/tests/auto/qtquick1/examples/examples.pro +++ b/tests/auto/qtquick1/examples/examples.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_examples macx:CONFIG -= app_bundle include(../../../../tools/qmlviewer/qml.pri) @@ -9,6 +9,6 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib qpa:CONFIG+=insignificant_test # QTBUG-20990, aborts diff --git a/tests/auto/qtquick1/moduleqt47/moduleqt47.pro b/tests/auto/qtquick1/moduleqt47/moduleqt47.pro index 04f7df5..d751ea0 100644 --- a/tests/auto/qtquick1/moduleqt47/moduleqt47.pro +++ b/tests/auto/qtquick1/moduleqt47/moduleqt47.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_moduleqt47 macx:CONFIG -= app_bundle SOURCES += tst_moduleqt47.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro b/tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro index 95ea356..57a285b 100644 --- a/tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro +++ b/tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeanchors SOURCES += tst_qdeclarativeanchors.cpp macx:CONFIG -= app_bundle @@ -7,4 +7,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro index 85e9f83..c5ec23e 100644 --- a/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro +++ b/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative network qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeanimatedimage HEADERS += ../../declarative/shared/testhttpserver.h SOURCES += tst_qdeclarativeanimatedimage.cpp ../../declarative/shared/testhttpserver.cpp macx:CONFIG -= app_bundle @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private network testlib diff --git a/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro index 895c1d4..7998a06 100644 --- a/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro @@ -1,8 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeanimations SOURCES += tst_qdeclarativeanimations.cpp macx:CONFIG -= app_bundle DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro index abbe163..d74cbff 100644 --- a/tests/auto/qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro +++ b/tests/auto/qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro @@ -1,6 +1,6 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeapplication macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeapplication.cpp -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro index 4ca2615..76a89eb 100644 --- a/tests/auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +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 widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro index 345f900..0c38a9c 100644 --- a/tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +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 widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro index c1a49b2..83319fa 100644 --- a/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeborderimage macx:CONFIG -= app_bundle HEADERS += ../../declarative/shared/testhttpserver.h @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private network testlib diff --git a/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro index 73f9f13..833c77d 100644 --- a/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +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 widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro b/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro index 13cf515..3b0fd67 100644 --- a/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro +++ b/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeflipable macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeflipable.cpp @@ -8,5 +8,5 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-21012 fails on exit (X11-specific) diff --git a/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro b/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro index 885f90b..a42997d 100644 --- a/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro +++ b/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro @@ -1,9 +1,9 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativefocusscope SOURCES += tst_qdeclarativefocusscope.cpp macx:CONFIG -= app_bundle DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib qpa:CONFIG+=insignificant_test # QTBUG-21013 unstable diff --git a/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro index a9d84ae..fc48544 100644 --- a/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network qtquick1 +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 widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private network testlib diff --git a/tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro b/tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro index baf3ce9..299b6a3 100644 --- a/tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro +++ b/tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativegridview macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativegridview.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro index 20b4abf..5c9b9db 100644 --- a/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeimage macx:CONFIG -= app_bundle HEADERS += ../../declarative/shared/testhttpserver.h @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private network testlib diff --git a/tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro index 3eb4305..ec1d87e 100644 --- a/tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro +++ b/tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 -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 widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private network testlib diff --git a/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro b/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro index cdb7913..31a71a5 100644 --- a/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro +++ b/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeitem macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeitem.cpp @@ -8,5 +8,5 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-21012 fails on exit (X11-specific) diff --git a/tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro b/tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro index 88c0575..1471884 100644 --- a/tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro +++ b/tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro @@ -1,9 +1,9 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativelayoutitem macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelayoutitem.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro index a7b5ba0..c928f1f 100644 --- a/tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +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 widgets-private declarative-private qtquick1-private +QT += core-private gui-private v8-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro b/tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro index 6495c7e..1f66d7f 100644 --- a/tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro +++ b/tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativelistview macx:CONFIG -= app_bundle HEADERS += incrementalmodel.h @@ -8,4 +8,4 @@ SOURCES += tst_qdeclarativelistview.cpp incrementalmodel.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro index 0082d00..7f3cfb2 100644 --- a/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro +++ b/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeloader macx:CONFIG -= app_bundle INCLUDEPATH += ../../declarative/shared/ @@ -11,4 +11,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private network testlib diff --git a/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro index b069887..f7e6a5b 100644 --- a/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro +++ b/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativemousearea macx:CONFIG -= app_bundle HEADERS += ../../declarative/shared/testhttpserver.h @@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private network testlib diff --git a/tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro b/tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro index 7f8d382..666fce9 100644 --- a/tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro +++ b/tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeparticles macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeparticles.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1 +QT += core-private gui-private widgets-private declarative-private qtquick1 testlib diff --git a/tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro b/tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro index 12ca9e9..cf5cf64 100644 --- a/tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro +++ b/tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativepathview macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepathview.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro b/tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro index 9cc0a8e..4a8ef9b 100644 --- a/tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro +++ b/tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativepincharea macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepincharea.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro b/tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro index e661342..2844c51 100644 --- a/tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro +++ b/tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativepositioners SOURCES += tst_qdeclarativepositioners.cpp macx:CONFIG -= app_bundle @@ -7,4 +7,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro b/tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro index cd55ab0..0fc556c 100644 --- a/tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro +++ b/tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativerepeater macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativerepeater.cpp @@ -7,4 +7,4 @@ SOURCES += tst_qdeclarativerepeater.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index e90d839..3044072 100644 --- a/tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +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 widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro index 17abe1f..14b5fb3 100644 --- a/tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +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 widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro b/tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro index fc9d0c8..1c9a586 100644 --- a/tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativestates macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativestates.cpp @@ -7,4 +7,4 @@ SOURCES += tst_qdeclarativestates.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro index 9bdc7d4..3efa477 100644 --- a/tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro +++ b/tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativesystempalette macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesystempalette.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro b/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro index 509ba20..0989aab 100644 --- a/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro @@ -1,6 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 -QT += network +CONFIG += testcase +TARGET = tst_qdeclarativetext macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetext.cpp @@ -13,4 +12,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private network testlib diff --git a/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro index 38ccff3..74c4215 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro +++ b/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativetextedit macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetextedit.cpp ../../declarative/shared/testhttpserver.cpp @@ -7,4 +7,4 @@ HEADERS += ../../declarative/shared/testhttpserver.h DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private network testlib diff --git a/tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro b/tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro index 0518451..655c4a2 100644 --- a/tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro +++ b/tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro @@ -1,9 +1,9 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativetextinput macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetextinput.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro index 209964c..4709d21 100644 --- a/tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +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 widgets-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro b/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro index fd9af63..08f10df 100644 --- a/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro +++ b/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro @@ -1,9 +1,9 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeview macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeview.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += core-private gui-private widgets-private declarative-private qtquick1-private widgets +QT += core-private gui-private widgets-private declarative-private qtquick1-private widgets testlib diff --git a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro index 5f96dac..b49264b 100644 --- a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativeviewer macx:CONFIG -= app_bundle include(../../../../tools/qmlviewer/qml.pri) @@ -9,4 +9,4 @@ SOURCES += tst_qdeclarativeviewer.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test insignificant_test -QT += core-private gui-private widgets-private declarative-private qtquick1-private widgets-private v8-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private v8-private testlib diff --git a/tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro b/tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro index 7dd1fe3..128e4ff 100644 --- a/tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro +++ b/tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 +CONFIG += testcase +TARGET = tst_qdeclarativevisualdatamodel macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativevisualdatamodel.cpp @@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index 7a55d7a..ea9f75b 100644 --- a/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network qtquick1 +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 widgets-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private network testlib diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/declarative/binding/binding.pro index c9567d3..ba59080 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 32f4aba..44ea3d0 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 a93eab8..6d0d9d7 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 4be45f5..586af79 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 7395cef..8026540 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 b829618..f04da8e 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 48c40a2..2dc917d 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 a114b86..a15ceba 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 5180a2a..d4112f9 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 da5765a..0d415db 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 e9aea4f..6f2712a 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 71dfdf3..6a46e8f 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 79fdd26..1ac0bb2 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 5dd371a..e194898 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 71d4485..310d17d 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 c18cbed..403387f 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 -- 2.7.4