From 891f7029457c5135c365ec32c06e7750abaceeab Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 15 Apr 2013 11:50:16 +0200 Subject: Fix compilation with built-in v4vm JS engine Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll --- tests/auto/particles/qquickage/qquickage.pro | 2 +- .../qquickangleddirection/qquickangleddirection.pro | 2 +- .../qquickcumulativedirection.pro | 2 +- .../qquickcustomaffector/qquickcustomaffector.pro | 2 +- .../qquickcustomparticle/qquickcustomparticle.pro | 2 +- .../qquickellipseextruder/qquickellipseextruder.pro | 2 +- tests/auto/particles/qquickfriction/qquickfriction.pro | 2 +- tests/auto/particles/qquickgravity/qquickgravity.pro | 2 +- .../auto/particles/qquickgroupgoal/qquickgroupgoal.pro | 2 +- .../qquickimageparticle/qquickimageparticle.pro | 2 +- .../particles/qquickitemparticle/qquickitemparticle.pro | 2 +- .../particles/qquicklineextruder/qquicklineextruder.pro | 2 +- .../particles/qquickmaskextruder/qquickmaskextruder.pro | 2 +- .../qquickparticlegroup/qquickparticlegroup.pro | 2 +- .../qquickparticlesystem/qquickparticlesystem.pro | 2 +- .../qquickpointattractor/qquickpointattractor.pro | 2 +- .../qquickpointdirection/qquickpointdirection.pro | 2 +- .../qquickrectangleextruder/qquickrectangleextruder.pro | 2 +- .../particles/qquickspritegoal/qquickspritegoal.pro | 2 +- .../qquicktargetdirection/qquicktargetdirection.pro | 2 +- .../particles/qquicktrailemitter/qquicktrailemitter.pro | 2 +- .../particles/qquickturbulence/qquickturbulence.pro | 2 +- tests/auto/particles/qquickwander/qquickwander.pro | 2 +- .../qqmlenginedebugservice/qqmlenginedebugservice.pro | 2 +- tests/auto/qml/qjsengine/qjsengine.pro | 2 +- tests/auto/qml/qjsengine/tst_qjsengine.cpp | 2 +- tests/auto/qml/qqmlconnections/qqmlconnections.pro | 2 +- tests/auto/qml/qqmlcontext/qqmlcontext.pro | 2 +- tests/auto/qml/qqmlcpputils/qqmlcpputils.pro | 2 +- tests/auto/qml/qqmldirparser/qqmldirparser.pro | 2 +- tests/auto/qml/qqmlecmascript/qqmlecmascript.pro | 2 +- tests/auto/qml/qqmlengine/qqmlengine.pro | 2 +- tests/auto/qml/qqmlglobal/qqmlglobal.pro | 2 +- tests/auto/qml/qqmlincubator/qqmlincubator.pro | 2 +- tests/auto/qml/qqmlinstruction/qqmlinstruction.pro | 2 +- tests/auto/qml/qqmllanguage/qqmllanguage.pro | 2 +- tests/auto/qml/qqmllistmodel/qqmllistmodel.pro | 2 +- .../qqmllistmodelworkerscript.pro | 2 +- tests/auto/qml/qqmlmetatype/qqmlmetatype.pro | 2 +- tests/auto/qml/qqmlproperty/qqmlproperty.pro | 2 +- tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro | 2 +- tests/auto/qml/qqmlqt/qqmlqt.pro | 2 +- tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro | 2 +- .../qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro | 2 +- tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro | 2 +- .../auto/qml/qquickworkerscript/qquickworkerscript.pro | 2 +- tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | 2 +- tests/auto/qml/v4/v4.pro | 2 +- tests/auto/quick/dialogs/dialogs.pro | 2 +- tests/auto/quick/examples/examples.pro | 2 +- tests/auto/quick/qquickanchors/qquickanchors.pro | 2 +- tests/auto/quick/qquickanimations/qquickanimations.pro | 2 +- tests/auto/quick/qquickbehaviors/qquickbehaviors.pro | 2 +- tests/auto/quick/qquickflickable/qquickflickable.pro | 2 +- tests/auto/quick/qquickflipable/qquickflipable.pro | 2 +- tests/auto/quick/qquickgridview/qquickgridview.pro | 2 +- tests/auto/quick/qquickitem/qquickitem.pro | 2 +- tests/auto/quick/qquickitem2/qquickitem2.pro | 2 +- tests/auto/quick/qquickitemlayer/qquickitemlayer.pro | 2 +- tests/auto/quick/qquicklistview/qquicklistview.pro | 2 +- .../auto/quick/qquickpainteditem/qquickpainteditem.pro | 2 +- tests/auto/quick/qquickpath/qquickpath.pro | 2 +- tests/auto/quick/qquickpathview/qquickpathview.pro | 2 +- .../qquicksmoothedanimation/qquicksmoothedanimation.pro | 2 +- .../qquickspringanimation/qquickspringanimation.pro | 2 +- tests/auto/quick/qquickstates/qquickstates.pro | 2 +- tests/auto/quick/qquicktext/qquicktext.pro | 2 +- tests/auto/quick/qquicktextedit/qquicktextedit.pro | 2 +- tests/auto/quick/qquicktextinput/qquicktextinput.pro | 2 +- .../qquickvisualdatamodel/qquickvisualdatamodel.pro | 2 +- tests/auto/quick/qquickwindow/qquickwindow.pro | 2 +- .../quick/qquickxmllistmodel/qquickxmllistmodel.pro | 2 +- tests/auto/quick/rendernode/rendernode.pro | 2 +- tests/auto/quick/shared/util.pri | 2 +- tests/auto/quick/touchmouse/touchmouse.pro | 2 +- tests/benchmarks/particles/affectors/affectors.pro | 2 +- tests/benchmarks/particles/emission/emission.pro | 2 +- tests/benchmarks/qml/animation/animation.pro | 2 +- tests/benchmarks/qml/compilation/compilation.pro | 2 +- tests/benchmarks/qml/qquickwindow/qquickwindow.pro | 2 +- tests/benchmarks/qml/script/script.pro | 2 +- tests/benchmarks/script/qjsvalue/qjsvalue.pro | 2 +- tests/manual/v4/tests.pro | 17 +++++++++++++++-- 83 files changed, 97 insertions(+), 84 deletions(-) (limited to 'tests') diff --git a/tests/auto/particles/qquickage/qquickage.pro b/tests/auto/particles/qquickage/qquickage.pro index 1986e00818..3fffb28f31 100644 --- a/tests/auto/particles/qquickage/qquickage.pro +++ b/tests/auto/particles/qquickage/qquickage.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro index c1b853d323..4533f94388 100644 --- a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro +++ b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro index 27d1f564fa..ba4a6ba9d9 100644 --- a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro +++ b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro index d6bc56d5a4..9442a29fb9 100644 --- a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro +++ b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro index 441cf7712f..48e7303f86 100644 --- a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro +++ b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro @@ -7,6 +7,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro index 3e7d9444cb..324b980e78 100644 --- a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro +++ b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickfriction/qquickfriction.pro b/tests/auto/particles/qquickfriction/qquickfriction.pro index f4ffa09b22..b90b31ece2 100644 --- a/tests/auto/particles/qquickfriction/qquickfriction.pro +++ b/tests/auto/particles/qquickfriction/qquickfriction.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickgravity/qquickgravity.pro b/tests/auto/particles/qquickgravity/qquickgravity.pro index 574f914d3c..07c9eba314 100644 --- a/tests/auto/particles/qquickgravity/qquickgravity.pro +++ b/tests/auto/particles/qquickgravity/qquickgravity.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro b/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro index c23b366d34..31b6fa5457 100644 --- a/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro +++ b/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private testlib quick-private quickparticles-private +QT += core-private gui-private qml-private testlib quick-private quickparticles-private DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro index e07ac09fa0..271b2ec57c 100644 --- a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro +++ b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro @@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro index 7a0f8aa71e..7db55d29e9 100644 --- a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro +++ b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro @@ -7,6 +7,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro index eea00ecf06..85e98f3cd4 100644 --- a/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro +++ b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro index c9b217a7ab..d83006e523 100644 --- a/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro +++ b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro index a1f30a079e..3d98e5f3bd 100644 --- a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro +++ b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro index d4cf1b4e5d..d3aeaecdca 100644 --- a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro +++ b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro index c8a460c335..60b1c1fc7f 100644 --- a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro +++ b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro index ecb171afac..e61527a11d 100644 --- a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro +++ b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro index 54169bcdc9..a8b2c1ca95 100644 --- a/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro +++ b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro b/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro index 3e53fae2e6..eb127c5fc2 100644 --- a/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro +++ b/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private testlib quick-private quickparticles-private +QT += core-private gui-private qml-private testlib quick-private quickparticles-private DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro index 09511daca1..9fe6747378 100644 --- a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro +++ b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro index 28675e2695..1cb792eff2 100644 --- a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro +++ b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickturbulence/qquickturbulence.pro b/tests/auto/particles/qquickturbulence/qquickturbulence.pro index 08961f1dc2..2db3d54e4c 100644 --- a/tests/auto/particles/qquickturbulence/qquickturbulence.pro +++ b/tests/auto/particles/qquickturbulence/qquickturbulence.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/particles/qquickwander/qquickwander.pro b/tests/auto/particles/qquickwander/qquickwander.pro index 6678b49435..41171645a2 100644 --- a/tests/auto/particles/qquickwander/qquickwander.pro +++ b/tests/auto/particles/qquickwander/qquickwander.pro @@ -6,6 +6,6 @@ macx:CONFIG -= app_bundle include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib +QT += core-private gui-private qml-private quick-private quickparticles-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro index 305f8f2509..5dadef62e4 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro @@ -12,5 +12,5 @@ include(../shared/debugutil.pri) DEFINES += QT_QML_DEBUG_NO_WARNING -QT += core-private qml-private quick-private v8-private testlib gui-private +QT += core-private qml-private quick-private testlib gui-private DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro index 85b6a07c90..a62eb75c21 100644 --- a/tests/auto/qml/qjsengine/qjsengine.pro +++ b/tests/auto/qml/qjsengine/qjsengine.pro @@ -1,7 +1,7 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qjsengine -QT += v8-private qml widgets testlib gui-private +QT += qml qml-private widgets testlib gui-private macx:CONFIG -= app_bundle SOURCES += tst_qjsengine.cpp diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 70b718c4d8..0a238846b2 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QObjectList) diff --git a/tests/auto/qml/qqmlconnections/qqmlconnections.pro b/tests/auto/qml/qqmlconnections/qqmlconnections.pro index 52f85f6219..7004ee0385 100644 --- a/tests/auto/qml/qqmlconnections/qqmlconnections.pro +++ b/tests/auto/qml/qqmlconnections/qqmlconnections.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlcontext/qqmlcontext.pro b/tests/auto/qml/qqmlcontext/qqmlcontext.pro index 48c0b5767c..2fb299cb10 100644 --- a/tests/auto/qml/qqmlcontext/qqmlcontext.pro +++ b/tests/auto/qml/qqmlcontext/qqmlcontext.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private qml-private testlib v8-private +QT += core-private gui-private qml-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlcpputils/qqmlcpputils.pro b/tests/auto/qml/qqmlcpputils/qqmlcpputils.pro index a3951da821..75436dd8e2 100644 --- a/tests/auto/qml/qqmlcpputils/qqmlcpputils.pro +++ b/tests/auto/qml/qqmlcpputils/qqmlcpputils.pro @@ -6,5 +6,5 @@ SOURCES += tst_qqmlcpputils.cpp CONFIG += parallel_test -QT += core-private gui-private qml-private testlib v8-private +QT += core-private gui-private qml-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmldirparser/qqmldirparser.pro b/tests/auto/qml/qqmldirparser/qqmldirparser.pro index 2abb4bd448..268198d050 100644 --- a/tests/auto/qml/qqmldirparser/qqmldirparser.pro +++ b/tests/auto/qml/qqmldirparser/qqmldirparser.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qqmldirparser -QT += qml testlib v8-private +QT += qml testlib macx:CONFIG -= app_bundle SOURCES += tst_qqmldirparser.cpp diff --git a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro index bc55ed9376..6193ee7c88 100644 --- a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro +++ b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro @@ -16,7 +16,7 @@ include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private network testlib +QT += core-private gui-private qml-private network testlib qtHaveModule(widgets): QT += widgets DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlengine/qqmlengine.pro b/tests/auto/qml/qqmlengine/qqmlengine.pro index 8c6610158b..fd8c463742 100644 --- a/tests/auto/qml/qqmlengine/qqmlengine.pro +++ b/tests/auto/qml/qqmlengine/qqmlengine.pro @@ -6,5 +6,5 @@ include (../../shared/util.pri) SOURCES += tst_qqmlengine.cpp -QT += core-private gui-private qml-private v8-private network testlib +QT += core-private gui-private qml-private network testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlglobal/qqmlglobal.pro b/tests/auto/qml/qqmlglobal/qqmlglobal.pro index 2715b44fad..d0d9fc400e 100644 --- a/tests/auto/qml/qqmlglobal/qqmlglobal.pro +++ b/tests/auto/qml/qqmlglobal/qqmlglobal.pro @@ -4,5 +4,5 @@ SOURCES += tst_qqmlglobal.cpp macx:CONFIG -= app_bundle CONFIG += parallel_test -QT += qml-private testlib v8-private core-private gui-private +QT += qml-private testlib core-private gui-private DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlincubator/qqmlincubator.pro b/tests/auto/qml/qqmlincubator/qqmlincubator.pro index 780b69f379..9249061912 100644 --- a/tests/auto/qml/qqmlincubator/qqmlincubator.pro +++ b/tests/auto/qml/qqmlincubator/qqmlincubator.pro @@ -13,5 +13,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private network testlib +QT += core-private gui-private qml-private network testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro b/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro index 73f29ab973..648abd2945 100644 --- a/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro +++ b/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro @@ -7,5 +7,5 @@ CONFIG += parallel_test include (../../shared/util.pri) -QT += core-private gui-private v8-private qml-private testlib +QT += core-private gui-private qml-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmllanguage/qqmllanguage.pro b/tests/auto/qml/qqmllanguage/qqmllanguage.pro index 942a511b7f..3b0518cfdf 100644 --- a/tests/auto/qml/qqmllanguage/qqmllanguage.pro +++ b/tests/auto/qml/qqmllanguage/qqmllanguage.pro @@ -12,7 +12,7 @@ SOURCES += ../../shared/testhttpserver.cpp TESTDATA = data/* -QT += core-private gui-private v8-private qml-private network testlib +QT += core-private gui-private qml-private network testlib include (../../shared/util.pri) DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro b/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro index ef044f1663..1555dc2b2c 100644 --- a/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro +++ b/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro b/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro index 14f0604a9b..7647c3d713 100644 --- a/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro +++ b/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro @@ -8,5 +8,5 @@ include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro b/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro index a9a6a32a2b..54a6e0507f 100644 --- a/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro +++ b/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro @@ -7,5 +7,5 @@ TESTDATA = data/* include (../../shared/util.pri) CONFIG += parallel_test -QT += core-private gui-private qml-private testlib v8-private +QT += core-private gui-private qml-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlproperty/qqmlproperty.pro b/tests/auto/qml/qqmlproperty/qqmlproperty.pro index 1ec02177ea..c2177d5fbf 100644 --- a/tests/auto/qml/qqmlproperty/qqmlproperty.pro +++ b/tests/auto/qml/qqmlproperty/qqmlproperty.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private testlib +QT += core-private gui-private qml-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro b/tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro index 5f75015d0d..7cc83cd440 100644 --- a/tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro +++ b/tests/auto/qml/qqmlpropertycache/qqmlpropertycache.pro @@ -5,5 +5,5 @@ macx:CONFIG -= app_bundle SOURCES += tst_qqmlpropertycache.cpp CONFIG += parallel_test -QT += core-private gui-private qml-private testlib v8-private +QT += core-private gui-private qml-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlqt/qqmlqt.pro b/tests/auto/qml/qqmlqt/qqmlqt.pro index 0be49304fb..0470156e28 100644 --- a/tests/auto/qml/qqmlqt/qqmlqt.pro +++ b/tests/auto/qml/qqmlqt/qqmlqt.pro @@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -QT += core-private v8-private qml-private quick-private testlib gui gui-private +QT += core-private qml-private quick-private testlib gui gui-private DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro b/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro index bd58608925..c32f3c6c34 100644 --- a/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro +++ b/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro @@ -8,5 +8,5 @@ include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private sql testlib +QT += core-private gui-private qml-private quick-private sql testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro b/tests/auto/qml/qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro index a482db40b4..7ef81e0cc4 100644 --- a/tests/auto/qml/qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro +++ b/tests/auto/qml/qqmlvaluetypeproviders/qqmlvaluetypeproviders.pro @@ -13,5 +13,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private gui testlib +QT += core-private gui-private qml-private quick-private gui testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro b/tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro index 1d02773146..e318966e56 100644 --- a/tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro +++ b/tests/auto/qml/qqmlvaluetypes/qqmlvaluetypes.pro @@ -13,5 +13,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private gui testlib +QT += core-private gui-private qml-private quick-private gui testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qquickworkerscript/qquickworkerscript.pro b/tests/auto/qml/qquickworkerscript/qquickworkerscript.pro index 56c89fab49..268b45f4e7 100644 --- a/tests/auto/qml/qquickworkerscript/qquickworkerscript.pro +++ b/tests/auto/qml/qquickworkerscript/qquickworkerscript.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private testlib +QT += core-private gui-private qml-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro index 36ece8d7e0..c6d442ecac 100644 --- a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro +++ b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro @@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -QT += core-private v8-private qml-private testlib gui gui-private +QT += core-private qml-private testlib gui gui-private DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/v4/v4.pro b/tests/auto/qml/v4/v4.pro index 8c7c30e399..ef549538da 100644 --- a/tests/auto/qml/v4/v4.pro +++ b/tests/auto/qml/v4/v4.pro @@ -12,5 +12,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private network testlib +QT += core-private gui-private qml-private network testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/dialogs/dialogs.pro b/tests/auto/quick/dialogs/dialogs.pro index 024b15a758..017ef0769a 100644 --- a/tests/auto/quick/dialogs/dialogs.pro +++ b/tests/auto/quick/dialogs/dialogs.pro @@ -9,7 +9,7 @@ macx:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable linux-*:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable CONFIG += parallel_test -QT += core-private gui-private qml-private quick-private v8-private testlib +QT += core-private gui-private qml-private quick-private testlib TESTDATA = data/* diff --git a/tests/auto/quick/examples/examples.pro b/tests/auto/quick/examples/examples.pro index 7f95771766..6543aa1b2b 100644 --- a/tests/auto/quick/examples/examples.pro +++ b/tests/auto/quick/examples/examples.pro @@ -8,5 +8,5 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary -QT += core-private gui-private qml-private quick-private v8-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickanchors/qquickanchors.pro b/tests/auto/quick/qquickanchors/qquickanchors.pro index b2e1c9df36..184066753b 100644 --- a/tests/auto/quick/qquickanchors/qquickanchors.pro +++ b/tests/auto/quick/qquickanchors/qquickanchors.pro @@ -11,5 +11,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private qml-private quick-private v8-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickanimations/qquickanimations.pro b/tests/auto/quick/qquickanimations/qquickanimations.pro index 747a2afdff..1e294b9ae0 100644 --- a/tests/auto/quick/qquickanimations/qquickanimations.pro +++ b/tests/auto/quick/qquickanimations/qquickanimations.pro @@ -11,5 +11,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro index cbe9cf76fe..f005c03a82 100644 --- a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro +++ b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickflickable/qquickflickable.pro b/tests/auto/quick/qquickflickable/qquickflickable.pro index 67d5fc12f0..dfc8d7541b 100644 --- a/tests/auto/quick/qquickflickable/qquickflickable.pro +++ b/tests/auto/quick/qquickflickable/qquickflickable.pro @@ -9,6 +9,6 @@ include (../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 CONFIG+=insignificant_test diff --git a/tests/auto/quick/qquickflipable/qquickflipable.pro b/tests/auto/quick/qquickflipable/qquickflipable.pro index d07aab8d71..3e4d04a401 100644 --- a/tests/auto/quick/qquickflipable/qquickflipable.pro +++ b/tests/auto/quick/qquickflipable/qquickflipable.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickgridview/qquickgridview.pro b/tests/auto/quick/qquickgridview/qquickgridview.pro index dd69cda49e..1efa6c4ae3 100644 --- a/tests/auto/quick/qquickgridview/qquickgridview.pro +++ b/tests/auto/quick/qquickgridview/qquickgridview.pro @@ -10,7 +10,7 @@ include (../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 mac:CONFIG+=insignificant_test # QTBUG-27890 diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro index ea6ae8f4af..81e2e3adef 100644 --- a/tests/auto/quick/qquickitem/qquickitem.pro +++ b/tests/auto/quick/qquickitem/qquickitem.pro @@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickitem2/qquickitem2.pro b/tests/auto/quick/qquickitem2/qquickitem2.pro index 62c6ee361c..ac4200a8a3 100644 --- a/tests/auto/quick/qquickitem2/qquickitem2.pro +++ b/tests/auto/quick/qquickitem2/qquickitem2.pro @@ -8,5 +8,5 @@ include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro b/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro index d7e75a9924..999f0cf23d 100644 --- a/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro +++ b/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro @@ -9,7 +9,7 @@ TESTDATA = data/* include(../../shared/util.pri) CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib OTHER_FILES += \ data/Smooth.qml \ diff --git a/tests/auto/quick/qquicklistview/qquicklistview.pro b/tests/auto/quick/qquicklistview/qquicklistview.pro index b0b1fc2518..a745c1ae46 100644 --- a/tests/auto/quick/qquicklistview/qquicklistview.pro +++ b/tests/auto/quick/qquicklistview/qquicklistview.pro @@ -12,7 +12,7 @@ include (../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private qml-private quick-private v8-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 mac:CONFIG += insignificant_test # QTBUG-27740 diff --git a/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro b/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro index 1f03b0ed5d..381167cd09 100644 --- a/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro +++ b/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro @@ -6,5 +6,5 @@ SOURCES += tst_qquickpainteditem.cpp CONFIG += parallel_test -QT += core-private gui-private qml-private quick-private v8-private network testlib +QT += core-private gui-private qml-private quick-private network testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickpath/qquickpath.pro b/tests/auto/quick/qquickpath/qquickpath.pro index f91c872ad9..4898f28c14 100644 --- a/tests/auto/quick/qquickpath/qquickpath.pro +++ b/tests/auto/quick/qquickpath/qquickpath.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro index fb02caebdc..e6cf9a488f 100644 --- a/tests/auto/quick/qquickpathview/qquickpathview.pro +++ b/tests/auto/quick/qquickpathview/qquickpathview.pro @@ -9,6 +9,6 @@ include (../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib qtHaveModule(widgets): QT += widgets DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro b/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro index 5e3872de83..4694172ac4 100644 --- a/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro +++ b/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro index 1254c3b4d7..2f0395d3ea 100644 --- a/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro +++ b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickstates/qquickstates.pro b/tests/auto/quick/qquickstates/qquickstates.pro index 753d8d42d4..1b638dfa67 100644 --- a/tests/auto/quick/qquickstates/qquickstates.pro +++ b/tests/auto/quick/qquickstates/qquickstates.pro @@ -9,5 +9,5 @@ include (../../shared/util.pri) TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktext/qquicktext.pro b/tests/auto/quick/qquicktext/qquicktext.pro index 4e3844bc58..c25a27b745 100644 --- a/tests/auto/quick/qquicktext/qquicktext.pro +++ b/tests/auto/quick/qquicktext/qquicktext.pro @@ -12,7 +12,7 @@ include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private network testlib +QT += core-private gui-private qml-private quick-private network testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 mac:CONFIG += insignificant_test # QTBUG-27740 diff --git a/tests/auto/quick/qquicktextedit/qquicktextedit.pro b/tests/auto/quick/qquicktextedit/qquicktextedit.pro index 44def7f0f9..814291ac35 100644 --- a/tests/auto/quick/qquicktextedit/qquicktextedit.pro +++ b/tests/auto/quick/qquicktextedit/qquicktextedit.pro @@ -11,7 +11,7 @@ include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private network-private testlib +QT += core-private gui-private qml-private quick-private network-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktextinput/qquicktextinput.pro b/tests/auto/quick/qquicktextinput/qquicktextinput.pro index 3240d99e90..c14b09c545 100644 --- a/tests/auto/quick/qquicktextinput/qquicktextinput.pro +++ b/tests/auto/quick/qquicktextinput/qquicktextinput.pro @@ -11,6 +11,6 @@ include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro index 60ae065910..7b0e0c2878 100644 --- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro +++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro @@ -11,6 +11,6 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib qtHaveModule(widgets): QT += widgets DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickwindow/qquickwindow.pro b/tests/auto/quick/qquickwindow/qquickwindow.pro index b1fc5cd4f2..05b58fcb4c 100644 --- a/tests/auto/quick/qquickwindow/qquickwindow.pro +++ b/tests/auto/quick/qquickwindow/qquickwindow.pro @@ -6,7 +6,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -QT += core-private gui-private qml-private quick-private v8-private testlib +QT += core-private gui-private qml-private quick-private testlib TESTDATA = data/* diff --git a/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro b/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro index 047d8ca560..da899a12ec 100644 --- a/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro +++ b/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro @@ -10,5 +10,5 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private network testlib xmlpatterns +QT += core-private gui-private qml-private network testlib xmlpatterns DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/rendernode/rendernode.pro b/tests/auto/quick/rendernode/rendernode.pro index 1e2c50a6d1..b195b97dcf 100644 --- a/tests/auto/quick/rendernode/rendernode.pro +++ b/tests/auto/quick/rendernode/rendernode.pro @@ -9,7 +9,7 @@ TESTDATA = data/* include(../../shared/util.pri) CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib OTHER_FILES += \ data/RenderOrder.qml \ diff --git a/tests/auto/quick/shared/util.pri b/tests/auto/quick/shared/util.pri index 28036f109c..bd2d202f1d 100644 --- a/tests/auto/quick/shared/util.pri +++ b/tests/auto/quick/shared/util.pri @@ -1,5 +1,5 @@ -QT += core-private gui-private v8-private qml-private quick-private +QT += core-private gui-private qml-private quick-private HEADERS += $$PWD/visualtestutil.h \ $$PWD/viewtestutil.h diff --git a/tests/auto/quick/touchmouse/touchmouse.pro b/tests/auto/quick/touchmouse/touchmouse.pro index bba0abdc17..e21695904e 100644 --- a/tests/auto/quick/touchmouse/touchmouse.pro +++ b/tests/auto/quick/touchmouse/touchmouse.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_touchmouse -QT += core-private gui-private qml-private quick-private v8-private testlib +QT += core-private gui-private qml-private quick-private testlib macx:CONFIG -= app_bundle diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro index 687422c7ec..51d65d7243 100644 --- a/tests/benchmarks/particles/affectors/affectors.pro +++ b/tests/benchmarks/particles/affectors/affectors.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib +QT += core-private gui-private qml-private quick-private opengl-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro index 7ffded64b3..f4445f7d8a 100644 --- a/tests/benchmarks/particles/emission/emission.pro +++ b/tests/benchmarks/particles/emission/emission.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib +QT += core-private gui-private qml-private quick-private opengl-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/qml/animation/animation.pro b/tests/benchmarks/qml/animation/animation.pro index 7490c5fe39..58933cf038 100644 --- a/tests/benchmarks/qml/animation/animation.pro +++ b/tests/benchmarks/qml/animation/animation.pro @@ -7,5 +7,5 @@ SOURCES += tst_animation.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += testlib core-private gui-private qml-private quick-private v8-private +QT += testlib core-private gui-private qml-private quick-private DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/qml/compilation/compilation.pro b/tests/benchmarks/qml/compilation/compilation.pro index 63c3da694f..a55864f696 100644 --- a/tests/benchmarks/qml/compilation/compilation.pro +++ b/tests/benchmarks/qml/compilation/compilation.pro @@ -1,7 +1,7 @@ CONFIG += testcase TEMPLATE = app TARGET = tst_compilation -QT += qml qml-private testlib core-private v8-private +QT += qml qml-private testlib core-private macx:CONFIG -= app_bundle CONFIG += release diff --git a/tests/benchmarks/qml/qquickwindow/qquickwindow.pro b/tests/benchmarks/qml/qquickwindow/qquickwindow.pro index 76aecf9d13..0676405e23 100644 --- a/tests/benchmarks/qml/qquickwindow/qquickwindow.pro +++ b/tests/benchmarks/qml/qquickwindow/qquickwindow.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib +QT += core-private gui-private qml-private quick-private opengl-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 \ No newline at end of file diff --git a/tests/benchmarks/qml/script/script.pro b/tests/benchmarks/qml/script/script.pro index 7beb3f81c1..51a02e796d 100644 --- a/tests/benchmarks/qml/script/script.pro +++ b/tests/benchmarks/qml/script/script.pro @@ -6,7 +6,7 @@ CONFIG += release SOURCES += tst_script.cpp -QT += core-private gui-private v8-private qml-private quick-private testlib +QT += core-private gui-private qml-private quick-private testlib DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/script/qjsvalue/qjsvalue.pro b/tests/benchmarks/script/qjsvalue/qjsvalue.pro index 7aa864c12f..b0134b085a 100644 --- a/tests/benchmarks/script/qjsvalue/qjsvalue.pro +++ b/tests/benchmarks/script/qjsvalue/qjsvalue.pro @@ -7,5 +7,5 @@ CONFIG += release SOURCES += tst_qjsvalue.cpp -QT += core-private v8-private qml-private testlib +QT += core-private qml-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/v4/tests.pro b/tests/manual/v4/tests.pro index 85e4f3a53d..5a0a97dcd3 100644 --- a/tests/manual/v4/tests.pro +++ b/tests/manual/v4/tests.pro @@ -1,2 +1,15 @@ -TEMPLATE = subdirs -SUBDIRS += auto +TEMPLATE = aux + +TESTSCRIPT=$$PWD/test262.py +V4CMD = v4 + +checktarget.target = check +checktarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations +checktarget.depends = all +QMAKE_EXTRA_TARGETS += checktarget + +checkmothtarget.target = check-interpreter +checkmothtarget.commands = python $$TESTSCRIPT --command=\"$$V4CMD --interpret\" --parallel --with-test-expectations +checkmothtarget.depends = all +QMAKE_EXTRA_TARGETS += checkmothtarget + -- cgit v1.2.3