diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-06 15:57:54 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-06 15:59:09 +0200 |
| commit | 27deff6d2b5a9eb1d98cd7b377ab934a35086664 (patch) | |
| tree | 4c34e422a8a838c59de68e7017d533cfb56d8eb5 /tests/auto | |
| parent | 0cca56f30d6a0290841859a58f517cece13d8d81 (diff) | |
| parent | f3cbd0b8aa96abfc4b3660df4426ed10b11b18e0 (diff) | |
Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative into dev
Change-Id: I278524d0f43d2237201d9cf78c1c36a5ecc83d84
Diffstat (limited to 'tests/auto')
168 files changed, 838 insertions, 3485 deletions
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/debugger.pro b/tests/auto/qml/debugger/debugger.pro index 8f90e4b4e9..2d9f2169e2 100644 --- a/tests/auto/qml/debugger/debugger.pro +++ b/tests/auto/qml/debugger/debugger.pro @@ -2,12 +2,12 @@ TEMPLATE = subdirs PUBLICTESTS += \ qqmlenginedebugservice \ - qqmldebugjs \ +# qqmldebugjs \ qqmlinspector \ qqmlprofilerservice \ qpacketprotocol \ - qv8profilerservice \ - qdebugmessageservice \ +# qv8profilerservice \ +# qdebugmessageservice \ qqmlenginedebuginspectorintegrationtest PRIVATETESTS += \ 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/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp index 421d4f0795..11afc9ea22 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp @@ -969,7 +969,7 @@ void tst_QQmlEngineDebugService::setBindingForObject() QmlDebugPropertyReference onEnteredRef = findProperty(mouseAreaObject.properties, "onEntered"); QCOMPARE(onEnteredRef.name, QString("onEntered")); - QCOMPARE(onEnteredRef.value, QVariant("(function onEntered() { { console.log('hello') } })")); + QCOMPARE(onEnteredRef.value, QVariant("{ console.log('hello') }")); m_dbg->setBindingForObject(mouseAreaObject.debugId, "onEntered", "{console.log('hello, world') }", false, 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 5e36a8a32d..1f43d21c51 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -49,7 +49,17 @@ #include <QtCore/qnumeric.h> #include <stdlib.h> -#include <private/v8.h> +#ifdef Q_CC_MSVC +#define NO_INLINE __declspec(noinline) +#else +#define NO_INLINE __attribute__((noinline)) +#endif + +#if defined(Q_OS_WIN) +#include <malloc.h> +#else +#include <alloca.h> +#endif Q_DECLARE_METATYPE(QList<int>) Q_DECLARE_METATYPE(QObjectList) @@ -57,10 +67,10 @@ Q_DECLARE_METATYPE(QObjectList) // The JavaScriptCore GC marks the C stack. To try to ensure that there is // no JSObject* left in stack memory by the compiler, we call this function // to zap some bytes of memory before calling collectGarbage(). -static void zapSomeStack() +static void NO_INLINE zapSomeStack() { - char buf[4096]; - memset(buf, 0, sizeof(buf)); + char *buf = (char*)alloca(4096); + memset(buf, 0, 4096); } static void collectGarbage_helper(QJSEngine &eng) @@ -69,11 +79,6 @@ static void collectGarbage_helper(QJSEngine &eng) eng.collectGarbage(); } -QT_BEGIN_NAMESPACE -extern Q_QML_EXPORT v8::Local<v8::Context> qt_QJSEngineV8Context(QJSEngine *); -extern Q_QML_EXPORT v8::Local<v8::Value> qt_QJSValueV8Value(const QJSValue &); -QT_END_NAMESPACE - class tst_QJSEngine : public QObject { Q_OBJECT @@ -128,7 +133,6 @@ private slots: void jsForInStatement_mutateWhileIterating(); void jsForInStatement_arrays(); void jsForInStatement_nullAndUndefined(); - void jsFunctionDeclarationAsStatement(); void stringObjects(); void jsStringPrototypeReplaceBugs(); void getterSetterThisObject_global(); @@ -154,10 +158,6 @@ private slots: void dateConversionQtJS(); void functionPrototypeExtensions(); void threadedEngine(); - - void v8Context_simple(); - void v8Context_exception(); - void v8Context_mixAPIs(); }; tst_QJSEngine::tst_QJSEngine() @@ -246,7 +246,6 @@ void tst_QJSEngine::newArray_HooliganTask233836() } { QJSValue ret = eng.newArray(0xFFFFFFFF); - QEXPECT_FAIL("", "The maximum length of arrays is defined by v8 currently and differs from Qt Script", Abort); QCOMPARE(ret.property("length").toUInt(), uint(0xFFFFFFFF)); ret.setProperty(0xFFFFFFFF, 123); QCOMPARE(ret.property("length").toUInt(), uint(0xFFFFFFFF)); @@ -269,7 +268,6 @@ void tst_QJSEngine::newVariant() QVERIFY(!opaque.isCallable()); QCOMPARE(opaque.isObject(), true); QVERIFY(!opaque.prototype().isUndefined()); - QEXPECT_FAIL("", "FIXME: newly created QObject's prototype is an JS Object", Continue); QCOMPARE(opaque.prototype().isVariant(), true); QVERIFY(opaque.property("valueOf").callWithInstance(opaque).equals(opaque)); } @@ -669,7 +667,6 @@ void tst_QJSEngine::globalObjectWithCustomPrototype() global.setPrototype(proto); { QJSValue ret = engine.evaluate("protoProperty"); - QEXPECT_FAIL("", "Replacing the prototype of the global object is currently unsupported (see also v8 issue 1078)", Abort); QVERIFY(ret.isNumber()); QVERIFY(ret.strictlyEquals(global.property("protoProperty"))); } @@ -679,11 +676,6 @@ void tst_QJSEngine::globalObjectWithCustomPrototype() QVERIFY(ret.strictlyEquals(global.property("protoProperty"))); } { - QJSValue ret = engine.evaluate("hasOwnProperty('protoProperty')"); - QVERIFY(ret.isBool()); - QVERIFY(!ret.toBool()); - } - { QJSValue ret = engine.evaluate("this.hasOwnProperty('protoProperty')"); QVERIFY(ret.isBool()); QVERIFY(!ret.toBool()); @@ -943,7 +935,6 @@ void tst_QJSEngine::evaluate() ret = eng.evaluate(code); QCOMPARE(ret.isError(), expectHadError); if (ret.isError()) { - QEXPECT_FAIL("", "we have no more lineNumber property ", Continue); QVERIFY(ret.property("lineNumber").strictlyEquals(eng.toScriptValue(expectErrorLineNumber))); } } @@ -1379,14 +1370,14 @@ void tst_QJSEngine::numberParsing_data() QTest::addColumn<qreal>("expect"); QTest::newRow("decimal 0") << QString("0") << qreal(0); - QTest::newRow("octal 0") << QString("00") << qreal(00); +// QTest::newRow("octal 0") << QString("00") << qreal(00); QTest::newRow("hex 0") << QString("0x0") << qreal(0x0); QTest::newRow("decimal 100") << QString("100") << qreal(100); QTest::newRow("hex 100") << QString("0x100") << qreal(0x100); - QTest::newRow("octal 100") << QString("0100") << qreal(0100); +// QTest::newRow("octal 100") << QString("0100") << qreal(0100); QTest::newRow("decimal 4G") << QString("4294967296") << qreal(Q_UINT64_C(4294967296)); QTest::newRow("hex 4G") << QString("0x100000000") << qreal(Q_UINT64_C(0x100000000)); - QTest::newRow("octal 4G") << QString("040000000000") << qreal(Q_UINT64_C(040000000000)); +// QTest::newRow("octal 4G") << QString("040000000000") << qreal(Q_UINT64_C(040000000000)); QTest::newRow("0.5") << QString("0.5") << qreal(0.5); QTest::newRow("1.5") << QString("1.5") << qreal(1.5); QTest::newRow("1e2") << QString("1e2") << qreal(100); @@ -1625,8 +1616,6 @@ void tst_QJSEngine::errorConstructors() QJSValue ret = eng.evaluate(code); QVERIFY(ret.isError()); QVERIFY(ret.toString().startsWith(name)); - //QTBUG-6138: JSC doesn't assign lineNumber when errors are not thrown - QEXPECT_FAIL("", "we have no more lineNumber property ", Continue); QCOMPARE(ret.property("lineNumber").toInt(), i+2); } } @@ -1854,7 +1843,7 @@ void tst_QJSEngine::jsForInStatement_mutateWhileIterating() QJSValue ret = eng.evaluate("o = { p: 123 }; r = [];" "for (var p in o) { r[r.length] = p; o.q = 456; } r"); QStringList lst = qjsvalue_cast<QStringList>(ret); - QCOMPARE(lst.size(), 1); + QCOMPARE(lst.size(), 2); QCOMPARE(lst.at(0), QString::fromLatin1("p")); } @@ -1910,47 +1899,6 @@ void tst_QJSEngine::jsForInStatement_nullAndUndefined() } } -void tst_QJSEngine::jsFunctionDeclarationAsStatement() -{ - // ECMA-262 does not allow function declarations to be used as statements, - // but several popular implementations (including JSC) do. See the NOTE - // at the beginning of chapter 12 in ECMA-262 5th edition, where it's - // recommended that implementations either disallow this usage or issue - // a warning. - // Since we had a bug report long ago about Qt Script not supporting this - // "feature" (and thus deviating from other implementations), we still - // check this behavior. - - QJSEngine eng; - QVERIFY(eng.globalObject().property("bar").isUndefined()); - eng.evaluate("function foo(arg) {\n" - " if (arg == 'bar')\n" - " function bar() { return 'bar'; }\n" - " else\n" - " function baz() { return 'baz'; }\n" - " return (arg == 'bar') ? bar : baz;\n" - "}"); - QVERIFY(eng.globalObject().property("bar").isUndefined()); - QVERIFY(eng.globalObject().property("baz").isUndefined()); - QVERIFY(eng.evaluate("foo").isCallable()); - { - QJSValue ret = eng.evaluate("foo('bar')"); - QVERIFY(ret.isCallable()); - QJSValue ret2 = ret.call(); - QCOMPARE(ret2.toString(), QString::fromLatin1("bar")); - QVERIFY(eng.globalObject().property("bar").isUndefined()); - QVERIFY(eng.globalObject().property("baz").isUndefined()); - } - { - QJSValue ret = eng.evaluate("foo('baz')"); - QVERIFY(ret.isCallable()); - QJSValue ret2 = ret.call(); - QCOMPARE(ret2.toString(), QString::fromLatin1("baz")); - QVERIFY(eng.globalObject().property("bar").isUndefined()); - QVERIFY(eng.globalObject().property("baz").isUndefined()); - } -} - void tst_QJSEngine::stringObjects() { // See ECMA-262 Section 15.5, "String Objects". @@ -2365,27 +2313,16 @@ void tst_QJSEngine::jsFutureReservedWords() QCOMPARE(!ret.isError(), allowed); } { - // this should probably be allowed (see task 162567) QJSEngine eng; QJSValue ret = eng.evaluate("o = {}; o." + word + " = 123"); - QEXPECT_FAIL("class", "QTBUG-27193", Abort); - QEXPECT_FAIL("const", "QTBUG-27193", Abort); - QEXPECT_FAIL("debugger", "QTBUG-27193", Abort); - QEXPECT_FAIL("enum", "QTBUG-27193", Abort); - QEXPECT_FAIL("export", "QTBUG-27193", Abort); - QEXPECT_FAIL("extends", "QTBUG-27193", Abort); - QEXPECT_FAIL("import", "QTBUG-27193", Abort); - QEXPECT_FAIL("super", "QTBUG-27193", Abort); - - QCOMPARE(ret.isNumber(), allowed); - QCOMPARE(!ret.isError(), allowed); + QCOMPARE(ret.isNumber(), true); + QCOMPARE(!ret.isError(), true); } { - // this should probably be allowed (see task 162567) QJSEngine eng; QJSValue ret = eng.evaluate("o = { " + word + ": 123 }"); - QCOMPARE(!ret.isError(), allowed); + QCOMPARE(!ret.isError(), true); } } @@ -2630,6 +2567,9 @@ void tst_QJSEngine::qRegExpInport() // effect at a given date (QTBUG-9770). void tst_QJSEngine::dateRoundtripJSQtJS() { +#ifdef Q_OS_WIN + QSKIP("This test fails on Windows due to a bug in QDateTime."); +#endif uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t(); QJSEngine eng; for (int i = 0; i < 8000; ++i) { @@ -2644,6 +2584,9 @@ void tst_QJSEngine::dateRoundtripJSQtJS() void tst_QJSEngine::dateRoundtripQtJSQt() { +#ifdef Q_OS_WIN + QSKIP("This test fails on Windows due to a bug in QDateTime."); +#endif QDateTime qtDate = QDateTime(QDate(2009, 1, 1)); QJSEngine eng; for (int i = 0; i < 8000; ++i) { @@ -2657,6 +2600,9 @@ void tst_QJSEngine::dateRoundtripQtJSQt() void tst_QJSEngine::dateConversionJSQt() { +#ifdef Q_OS_WIN + QSKIP("This test fails on Windows due to a bug in QDateTime."); +#endif uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t(); QJSEngine eng; for (int i = 0; i < 8000; ++i) { @@ -2728,99 +2674,6 @@ void tst_QJSEngine::threadedEngine() QCOMPARE(thread2.result, 2); } -void tst_QJSEngine::v8Context_simple() -{ - QJSEngine eng; - - v8::HandleScope handleScope; - v8::Local<v8::Context> context = QT_PREPEND_NAMESPACE(qt_QJSEngineV8Context(&eng)); - v8::Context::Scope contextScope(context); - - v8::Local<v8::Script> script = v8::Script::Compile( - v8::String::New("({ foo: 123, bar: 'ciao', baz: true })")); - - v8::TryCatch tc; - v8::Local<v8::Value> result = script->Run(); - - QVERIFY(!tc.HasCaught()); - QVERIFY(result->IsObject()); - - v8::Local<v8::Object> object = result.As<v8::Object>(); - QVERIFY(object->Get(v8::String::New("foo"))->Equals(v8::Number::New(123))); - QVERIFY(object->Get(v8::String::New("bar"))->Equals(v8::String::New("ciao"))); - QVERIFY(object->Get(v8::String::New("baz"))->IsTrue()); -} - -void tst_QJSEngine::v8Context_exception() -{ - QJSEngine eng; - - v8::HandleScope handleScope; - v8::Local<v8::Context> context = qt_QJSEngineV8Context(&eng); - v8::Context::Scope contextScope(context); - - int startLineNumber = 42; - v8::ScriptOrigin origin(v8::String::New("test.js"), v8::Integer::New(startLineNumber)); - v8::Local<v8::Script> script = v8::Script::Compile( - v8::String::New( - "function foo(i) {\n" - " if (i > 5)\n" - " throw Error('Catch me if you can');\n" - " foo(i + 1);\n" - "}\n" - "foo(0);"), - &origin); - -// QJS does this for us: -// v8::V8::SetCaptureStackTraceForUncaughtExceptions(true); - - v8::TryCatch tc; - v8::Local<v8::Value> result = script->Run(); - - QVERIFY(tc.HasCaught()); - QVERIFY(result.IsEmpty()); - - v8::Local<v8::Message> message = tc.Message(); - QVERIFY(!message.IsEmpty()); - QCOMPARE(*v8::String::AsciiValue(message->Get()), "Uncaught Error: Catch me if you can"); - QCOMPARE(*v8::String::AsciiValue(message->GetScriptResourceName()), "test.js"); - QCOMPARE(message->GetLineNumber(), startLineNumber + 3); -} - -void tst_QJSEngine::v8Context_mixAPIs() -{ - QJSEngine eng; - - v8::HandleScope handleScope; - v8::Local<v8::Context> context = qt_QJSEngineV8Context(&eng); - v8::Context::Scope contextScope(context); - - QJSValue globalQJS = eng.globalObject(); - v8::Local<v8::Value> globalV8Value = qt_QJSValueV8Value(globalQJS); - QVERIFY(!globalV8Value.IsEmpty()); - QVERIFY(globalV8Value->IsObject()); - v8::Local<v8::Object> globalV8 = globalV8Value.As<v8::Object>(); - - QVERIFY(globalQJS.property("foo").isUndefined()); - QVERIFY(globalV8->Get(v8::String::New("foo"))->IsUndefined()); - - globalQJS.setProperty("foo", 123); - QVERIFY(globalV8->Get(v8::String::New("foo"))->Equals(v8::Number::New(123))); - - globalV8->Set(v8::String::New("bar"), v8::String::New("ciao")); - QVERIFY(globalQJS.property("bar").equals("ciao")); - - QJSValue arrayQJS = eng.newArray(10); - v8::Local<v8::Value> arrayV8Value = qt_QJSValueV8Value(arrayQJS); - QVERIFY(!arrayV8Value.IsEmpty()); - QVERIFY(arrayV8Value->IsArray()); - v8::Local<v8::Array> arrayV8 = arrayV8Value.As<v8::Array>(); - - QCOMPARE(int(arrayV8->Length()), 10); - arrayV8->Set(5, v8::Null()); - QVERIFY(arrayQJS.property(5).isNull()); -} - QTEST_MAIN(tst_QJSEngine) #include "tst_qjsengine.moc" diff --git a/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp b/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp index b89192130e..aaeecb9fc9 100644 --- a/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp +++ b/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp @@ -428,7 +428,7 @@ void tst_qjsonbinding::writeProperty_javascriptExpression_data() QTest::newRow("object = object with function property") << "object" << "{ foo: function() {} }" << "{}"; QTest::newRow("array = array with function property") - << "array" << "[function() {}]" << "[]"; + << "array" << "[function() {}]" << "[null]"; // Inherited properties should not be included. QTest::newRow("value = object with inherited property") @@ -457,13 +457,13 @@ void tst_qjsonbinding::writeProperty_javascriptExpression_data() << "array" << "(function() { var a = [10, 20]; a.__proto__ = { proto_foo: 123 }; return a; })()" << "[10,20]"; - // Non-enumerable properties should be included. + // Non-enumerable properties should not be included. QTest::newRow("value = object with non-enumerable property") << "value" << "Object.defineProperty({}, 'foo', { value: 123, enumerable: false })" - << "{\"foo\":123}"; + << "{}"; QTest::newRow("object = object with non-enumerable property") << "object" << "Object.defineProperty({}, 'foo', { value: 123, enumerable: false })" - << "{\"foo\":123}"; + << "{}"; // Cyclic data structures are permitted, but the cyclic links become // empty objects. diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index 49e66c08dd..2b8da26dc9 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp @@ -378,7 +378,7 @@ void tst_QJSValue::toString() "})()"); QVERIFY(!objectObject.isError()); QVERIFY(objectObject.isObject()); - QCOMPARE(objectObject.toString(), QString::fromLatin1("TypeError: Function.prototype.toString is not generic")); + QCOMPARE(objectObject.toString(), QString::fromLatin1("TypeError: Type error")); } QJSValue inv = QJSValue(); @@ -1584,7 +1584,7 @@ void tst_QJSValue::getSetPrototype_evalCyclicPrototype() QJSEngine eng; QJSValue ret = eng.evaluate("o = { }; p = { }; o.__proto__ = p; p.__proto__ = o"); QCOMPARE(ret.isError(), true); - QCOMPARE(ret.toString(), QLatin1String("Error: Cyclic __proto__ value")); + QCOMPARE(ret.toString(), QLatin1String("TypeError: Cyclic __proto__ value")); } void tst_QJSValue::getSetPrototype_eval() @@ -1783,7 +1783,6 @@ void tst_QJSValue::call_twoEngines() QJSEngine otherEngine; QJSValue fun = otherEngine.evaluate("(function() { return 1; })"); QVERIFY(fun.isCallable()); - QTest::ignoreMessage(QtWarningMsg, "JSValue can't be rassigned to an another engine."); QTest::ignoreMessage(QtWarningMsg, "QJSValue::call() failed: " "cannot call function with thisObject created in " "a different engine"); @@ -2070,7 +2069,6 @@ void tst_QJSValue::equals() { QJSValue var1 = eng.toScriptValue(QVariant(QPoint(1, 2))); QJSValue var2 = eng.toScriptValue(QVariant(QPoint(1, 2))); - QEXPECT_FAIL("", "FIXME: QVariant comparison does not work with v8", Continue); QVERIFY(var1.equals(var2)); } { @@ -2078,12 +2076,6 @@ void tst_QJSValue::equals() QJSValue var2 = eng.toScriptValue(QVariant(QPoint(3, 4))); QVERIFY(!var1.equals(var2)); } - - QJSEngine otherEngine; - QTest::ignoreMessage(QtWarningMsg, "QJSValue::equals: " - "cannot compare to a value created in " - "a different engine"); - QCOMPARE(date1.equals(otherEngine.toScriptValue(123)), false); } void tst_QJSValue::strictlyEquals() @@ -2221,12 +2213,6 @@ void tst_QJSValue::strictlyEquals() QJSValue var2 = eng.toScriptValue(QVariant(QPoint(3, 4))); QVERIFY(!var1.strictlyEquals(var2)); } - - QJSEngine otherEngine; - QTest::ignoreMessage(QtWarningMsg, "QJSValue::strictlyEquals: " - "cannot compare to a value created in " - "a different engine"); - QCOMPARE(date1.strictlyEquals(otherEngine.toScriptValue(123)), false); } Q_DECLARE_METATYPE(int*) @@ -2423,6 +2409,7 @@ void tst_QJSValue::prettyPrinter() QJSValue val = eng.evaluate("(" + function + ")"); QVERIFY(val.isCallable()); QString actual = val.toString(); + QSKIP("Function::toString() doesn't give the whole function on v4"); int count = qMin(actual.size(), expected.size()); for (int i = 0; i < count; ++i) { QCOMPARE(actual.at(i), expected.at(i)); diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index ed828dfb4d..18065f1a24 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -33,6 +33,7 @@ PRIVATETESTS += \ qqmlecmascript \ qqmlcontext \ qqmlexpression \ + qqmldirparser \ qqmlglobal \ qqmlinstruction \ qqmllanguage \ @@ -52,9 +53,9 @@ PRIVATETESTS += \ qquickworkerscript \ qqmlbundle \ qrcqml \ - v4 \ qqmltimer \ - qqmlinstantiator + qqmlinstantiator \ + qv4debugger qtHaveModule(widgets) { PUBLICTESTS += \ diff --git a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp index c9ef8b257c..e513861bdf 100644 --- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp +++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp @@ -94,6 +94,7 @@ void tst_qmlmin::initTestCase() excludedDirs << "doc/src/snippets/qtquick1/visualdatamodel_rootindex"; excludedDirs << "doc/src/snippets/qtquick1/qtbinding"; excludedDirs << "doc/src/snippets/qtquick1/imports"; + excludedDirs << "tests/manual/v4"; // Add invalid files (i.e. files with syntax errors) invalidFiles << "tests/auto/quick/qquickloader/data/InvalidSourceComponent.qml"; diff --git a/tests/auto/qml/qqmlcomponent/data/onDestructionLookup.qml b/tests/auto/qml/qqmlcomponent/data/onDestructionLookup.qml index a49a86e1f3..a62d81c844 100644 --- a/tests/auto/qml/qqmlcomponent/data/onDestructionLookup.qml +++ b/tests/auto/qml/qqmlcomponent/data/onDestructionLookup.qml @@ -18,8 +18,13 @@ Item { } } + function createObject() + { + internalComponent.createObject(); + } + Component.onCompleted: { - internalComponent.createObject() + createObject() gc() } } 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/qqmlconsole/tst_qqmlconsole.cpp b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp index 561602fda5..e6f31dcb83 100644 --- a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp +++ b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp @@ -80,11 +80,11 @@ void tst_qqmlconsole::logging() QTest::ignoreMessage(QtDebugMsg, "{\"a\":\"hello\",\"d\":1}"); QTest::ignoreMessage(QtDebugMsg, "undefined"); QTest::ignoreMessage(QtDebugMsg, "12"); - QTest::ignoreMessage(QtDebugMsg, "function () { return 5;}"); + QTest::ignoreMessage(QtDebugMsg, "function() { [code] }"); QTest::ignoreMessage(QtDebugMsg, "true"); // Printing QML object prints out the class/type of QML object with the memory address // QTest::ignoreMessage(QtDebugMsg, "QtObject_QML_0(0xABCD..)"); - QTest::ignoreMessage(QtDebugMsg, "[object Object]"); +// QTest::ignoreMessage(QtDebugMsg, "[object Object]"); QTest::ignoreMessage(QtDebugMsg, "1 pong! [object Object]"); QTest::ignoreMessage(QtDebugMsg, "1 [ping,pong] [object Object] 2"); @@ -99,8 +99,8 @@ void tst_qqmlconsole::tracing() QUrl testUrl = testFileUrl("tracing.qml"); QString traceText = - QString::fromLatin1("tracing (%1:%2:%3)\n").arg(testUrl.toString()).arg(50).arg(17) + - QString::fromLatin1("onCompleted (%1:%2:%3)").arg(testUrl.toString()).arg(54).arg(9); + QString::fromLatin1("tracing (%1:%2)\n").arg(testUrl.toString()).arg(50) + + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(54); QTest::ignoreMessage(QtDebugMsg, qPrintable(traceText)); @@ -130,11 +130,11 @@ void tst_qqmlconsole::assert() // assert() QString assert1 = "This will fail\n" + - QString::fromLatin1("onCompleted (%1:%2:%3)").arg(testUrl.toString()).arg(54).arg(17); + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(54); QString assert2 = "This will fail too\n" + - QString::fromLatin1("assertFail (%1:%2:%3)\n").arg(testUrl.toString()).arg(47).arg(17) + - QString::fromLatin1("onCompleted (%1:%2:%3)").arg(testUrl.toString()).arg(59).arg(9); + QString::fromLatin1("assertFail (%1:%2)\n").arg(testUrl.toString()).arg(47) + + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(59); QTest::ignoreMessage(QtCriticalMsg, qPrintable(assert1)); QTest::ignoreMessage(QtCriticalMsg, qPrintable(assert2)); @@ -151,11 +151,11 @@ void tst_qqmlconsole::exception() // exception() QString exception1 = "Exception 1\n" + - QString::fromLatin1("onCompleted (%1:%2:%3)").arg(testUrl.toString()).arg(51).arg(21); + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(51); QString exception2 = "Exception 2\n" + - QString::fromLatin1("exceptionFail (%1:%2:%3)\n").arg(testUrl.toString()).arg(46).arg(17) + - QString::fromLatin1("onCompleted (%1:%2:%3)").arg(testUrl.toString()).arg(56).arg(9); + QString::fromLatin1("exceptionFail (%1:%2)\n").arg(testUrl.toString()).arg(46) + + QString::fromLatin1("onCompleted (%1:%2)").arg(testUrl.toString()).arg(56); QTest::ignoreMessage(QtCriticalMsg, qPrintable(exception1)); QTest::ignoreMessage(QtCriticalMsg, qPrintable(exception2)); 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..0be38a0a35 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 qml-private macx:CONFIG -= app_bundle SOURCES += tst_qqmldirparser.cpp diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp index cd8f050d2d..bf76c07970 100644 --- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp +++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp @@ -45,7 +45,6 @@ #include <QObject> #include <QQmlEngine> #include <QQmlComponent> -#include <private/v8.h> #include <private/qqmldirparser_p.h> #include <QDebug> diff --git a/tests/auto/qml/qqmlecmascript/data/PropertyVarOwnershipComponent.qml b/tests/auto/qml/qqmlecmascript/data/PropertyVarOwnershipComponent.qml index c1f73d3bac..f4307081c5 100644 --- a/tests/auto/qml/qqmlecmascript/data/PropertyVarOwnershipComponent.qml +++ b/tests/auto/qml/qqmlecmascript/data/PropertyVarOwnershipComponent.qml @@ -31,7 +31,6 @@ Rectangle { function deassignVp() { textTwo.textCanary = 22; textTwo.vp = textTwo.textCanary; - gc(); } } } diff --git a/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml b/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml index 3d8fd85a88..943d34ca84 100644 --- a/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml @@ -19,11 +19,11 @@ MyQmlObject { property bool assignWrongType: false property bool assignWrongTypeToValueType: false + function myFunction() { + return aNumber * 10; + } onAssignToPropertyChanged: { - function myFunction() { - return aNumber * 10; - } a = Qt.binding(myFunction); } @@ -54,17 +54,17 @@ MyQmlObject { // detecting errors: + function myEmptyFunction() { + } onAssignFuncWithoutReturnChanged: { - function myFunction() { - } - a = Qt.binding(myFunction); + a = Qt.binding(myEmptyFunction); } + function myStringFunction() { + return 'a string'; + } onAssignWrongTypeChanged: { - function myFunction() { - return 'a string'; - } - aNumber = Qt.binding(myFunction); + aNumber = Qt.binding(myStringFunction); } onAssignWrongTypeToValueTypeChanged: { diff --git a/tests/auto/qml/qqmlecmascript/data/include.js b/tests/auto/qml/qqmlecmascript/data/include.js index 232fd808f8..489e322ef0 100644 --- a/tests/auto/qml/qqmlecmascript/data/include.js +++ b/tests/auto/qml/qqmlecmascript/data/include.js @@ -3,6 +3,6 @@ var test2 = false var test3 = false function go() { - Qt.include("js/include2.js"); + console.log(Qt.include("js/include2.js").status); } diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVar.circular.2.qml b/tests/auto/qml/qqmlecmascript/data/propertyVar.circular.2.qml index 93c44afcc9..483ee3e916 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVar.circular.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVar.circular.2.qml @@ -21,6 +21,5 @@ Item { function deassignCircular() { vp = 2; - gc(); } } diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVar.circular.qml b/tests/auto/qml/qqmlecmascript/data/propertyVar.circular.qml index 171d7747cd..9db2c88256 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVar.circular.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVar.circular.qml @@ -19,7 +19,6 @@ Item { function deassignCanaryResource() { canaryResource = 1; - gc(); } function assignCircular() { @@ -32,7 +31,6 @@ Item { function deassignCircular() { canaryInt = 2; varProperty = 2; - gc(); } function assignThenDeassign() { diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVar.inherit.qml b/tests/auto/qml/qqmlecmascript/data/propertyVar.inherit.qml index abd0dd7c04..5e318e15a8 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVar.inherit.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVar.inherit.qml @@ -22,7 +22,6 @@ Item { function deassignCircular() { varProperty = 2; - gc(); } function assignThenDeassign() { diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVar.reparent.qml b/tests/auto/qml/qqmlecmascript/data/propertyVar.reparent.qml index 7b3df674f1..6f5094de27 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVar.reparent.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVar.reparent.qml @@ -21,7 +21,6 @@ Item { function deassignVarProp() { vp = 2; - gc(); } } diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVarImplicitOwnership.qml b/tests/auto/qml/qqmlecmascript/data/propertyVarImplicitOwnership.qml index 9cebded932..ecc4892334 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVarImplicitOwnership.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVarImplicitOwnership.qml @@ -21,6 +21,5 @@ Item { function deassignCircular() { vp = 2; - gc(); } } diff --git a/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.5.qml b/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.5.qml index 1143eaf919..c2325fb5ee 100644 --- a/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.5.qml +++ b/tests/auto/qml/qqmlecmascript/data/propertyVarOwnership.5.qml @@ -5,7 +5,8 @@ Item { id: testOwnership property bool test: false - function runTest() { + function createComponent() + { var o; var c = Qt.createComponent("ComponentWithVarProp.qml"); if (c.status == Component.Ready) { @@ -15,8 +16,12 @@ Item { } o.varprop = true; // causes initialization of varProperties. SingletonType.QObject.trackObject(o); // stores QObject ptr - if (SingletonType.QObject.trackedObject() == null) return; // is still valid, should have a valid v8object. - o = new Date(); // causes object to be gc-able. + if (SingletonType.QObject.trackedObject() == null) return false // is still valid, should have a valid v8object. + return true; + } + + function runTest() { + if (!createComponent()) return; gc(); // collect object's v8object + varProperties, queues deleteLater. if (SingletonType.QObject.trackedObject() != null) return; // v8object was previously collected. SingletonType.QObject.setTrackedObjectProperty("varprop"); // deferences varProperties of object. diff --git a/tests/auto/qml/qqmlecmascript/data/signalArguments.1.qml b/tests/auto/qml/qqmlecmascript/data/signalArguments.1.qml index 3ab714b800..09fffbba36 100644 --- a/tests/auto/qml/qqmlecmascript/data/signalArguments.1.qml +++ b/tests/auto/qml/qqmlecmascript/data/signalArguments.1.qml @@ -2,10 +2,8 @@ import Qt.test 1.0 MyQmlObject { property int argumentCount: -1 - property bool calleeCorrect: false onBasicSignal: { argumentCount = arguments.length - calleeCorrect = (arguments.callee === onBasicSignal) setString('pass') } } diff --git a/tests/auto/qml/qqmlecmascript/data/signalArguments.2.qml b/tests/auto/qml/qqmlecmascript/data/signalArguments.2.qml index 8ecb8df6ee..fec810fd28 100644 --- a/tests/auto/qml/qqmlecmascript/data/signalArguments.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/signalArguments.2.qml @@ -2,11 +2,9 @@ import Qt.test 1.0 MyQmlObject { property int argumentCount: -1 - property bool calleeCorrect: false onArgumentSignal: { argumentCount = arguments.length - calleeCorrect = (arguments.callee === onArgumentSignal) setString('pass ' + arguments[0] + ' ' + arguments[1] + ' ' + arguments[2] + ' ' + arguments[3] + ' ' + arguments[4]) diff --git a/tests/auto/qml/qqmlecmascript/data/v8functionException.qml b/tests/auto/qml/qqmlecmascript/data/v8functionException.qml deleted file mode 100644 index 51df1c65d8..0000000000 --- a/tests/auto/qml/qqmlecmascript/data/v8functionException.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 - -// This test uses a multi-line string which has \r-terminated -// string fragments. The expression rewriter deliberately doesn't -// handle \r-terminated string fragments (see QTBUG-24064) and thus -// this test ensures that we don't crash when the client attempts -// to invoke a non-compiled dynamic slot. - -Item { - id: root - - function dynamicSlot() { - var someString = "Hello,
this is a
multiline string"; - } -} 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/qqmlecmascript/testtypes.cpp b/tests/auto/qml/qqmlecmascript/testtypes.cpp index 8b0278373a..64aac83c02 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.cpp +++ b/tests/auto/qml/qqmlecmascript/testtypes.cpp @@ -104,10 +104,9 @@ public: void setWidth(int) { } }; -void MyQmlObject::v8function(QQmlV8Function *) +void MyQmlObject::v8function(QQmlV4Function *function) { - const char *error = "Exception thrown from within QObject slot"; - v8::ThrowException(v8::Exception::Error(v8::String::New(error))); + QV8Engine::getV4(function->engine())->current->throwError(QStringLiteral("Exception thrown from within QObject slot")); } static QJSValue script_api(QQmlEngine *engine, QJSEngine *scriptEngine) @@ -300,7 +299,6 @@ void registerTypes() qRegisterMetaType<Qt::MouseButtons>("Qt::MouseButtons"); qmlRegisterType<CircularReferenceObject>("Qt.test", 1, 0, "CircularReferenceObject"); - qmlRegisterType<CircularReferenceHandle>("Qt.test", 1, 0, "CircularReferenceHandle"); qmlRegisterType<MyDynamicCreationDestructionObject>("Qt.test", 1, 0, "MyDynamicCreationDestructionObject"); qmlRegisterType<WriteCounter>("Qt.test", 1, 0, "WriteCounter"); diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index e4dd1e3e18..4d30816b0a 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -63,6 +63,7 @@ #include <private/qqmlengine_p.h> #include <private/qv8engine_p.h> +#include <private/qv4qobjectwrapper_p.h> class MyQmlAttachedObject : public QObject { @@ -265,7 +266,7 @@ public slots: void myinvokable(MyQmlObject *o) { myinvokableObject = o; } void variantMethod(const QVariant &v) { m_variant = v; } void qjsvalueMethod(const QJSValue &v) { m_qjsvalue = v; } - void v8function(QQmlV8Function*); + void v8function(QQmlV4Function*); void registeredFlagMethod(Qt::MouseButtons v) { m_buttons = v; } private: @@ -1172,16 +1173,14 @@ private: int m_value; }; -class CircularReferenceObject : public QObject, - public QV8GCCallback::Node +class CircularReferenceObject : public QObject { Q_OBJECT public: CircularReferenceObject(QObject *parent = 0) - : QObject(parent), QV8GCCallback::Node(callback), m_referenced(0), m_dtorCount(0) + : QObject(parent), m_dtorCount(0) { - QV8GCCallback::addGcCallbackNode(this); } ~CircularReferenceObject() @@ -1204,74 +1203,15 @@ public: Q_INVOKABLE void addReference(QObject *other) { - m_referenced = other; - } + QQmlData *ddata = QQmlData::get(this); + assert(ddata); + QV4::QObjectWrapper *thisObject = ddata->jsWrapper.value().as<QV4::QObjectWrapper>(); + assert(thisObject); - static void callback(QV8GCCallback::Node *n) - { - CircularReferenceObject *cro = static_cast<CircularReferenceObject*>(n); - if (cro->m_referenced) { - cro->m_engine->addRelationshipForGC(cro, cro->m_referenced); - } - } + QQmlData *otherDData = QQmlData::get(other); + assert(otherDData); - void setEngine(QQmlEngine* declarativeEngine) - { - m_engine = QQmlEnginePrivate::get(declarativeEngine)->v8engine(); - } - -private: - QObject *m_referenced; - int *m_dtorCount; - QV8Engine* m_engine; -}; -Q_DECLARE_METATYPE(CircularReferenceObject*) - -class CircularReferenceHandle : public QObject, - public QV8GCCallback::Node -{ - Q_OBJECT - -public: - CircularReferenceHandle(QObject *parent = 0) - : QObject(parent), QV8GCCallback::Node(gccallback), m_dtorCount(0), m_engine(0) - { - QV8GCCallback::addGcCallbackNode(this); - } - - ~CircularReferenceHandle() - { - if (m_dtorCount) *m_dtorCount = *m_dtorCount + 1; - } - - Q_INVOKABLE void setDtorCount(int *dtorCount) - { - m_dtorCount = dtorCount; - } - - Q_INVOKABLE CircularReferenceHandle *generate(QObject *parent = 0) - { - CircularReferenceHandle *retn = new CircularReferenceHandle(parent); - retn->m_dtorCount = m_dtorCount; - retn->m_engine = m_engine; - return retn; - } - - Q_INVOKABLE void addReference(v8::Persistent<v8::Value> handle) - { - m_referenced = qPersistentNew(handle); - m_referenced.MakeWeak(static_cast<void*>(this), wrcallback); - } - - static void wrcallback(v8::Persistent<v8::Value> handle, void *) - { - qPersistentDispose(handle); - } - - static void gccallback(QV8GCCallback::Node *n) - { - CircularReferenceHandle *crh = static_cast<CircularReferenceHandle*>(n); - crh->m_engine->addRelationshipForGC(crh, crh->m_referenced); + thisObject->defineDefaultProperty(thisObject->engine(), QStringLiteral("autoTestStrongRef"), otherDData->jsWrapper.value()); } void setEngine(QQmlEngine* declarativeEngine) @@ -1280,11 +1220,10 @@ public: } private: - v8::Persistent<v8::Value> m_referenced; int *m_dtorCount; QV8Engine* m_engine; }; -Q_DECLARE_METATYPE(CircularReferenceHandle*) +Q_DECLARE_METATYPE(CircularReferenceObject*) class MyDynamicCreationDestructionObject : public QObject { diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index c417879d3c..321aa47297 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -45,15 +45,28 @@ #include <QtQml/qqmlcontext.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdebug.h> -#include <QtQml/private/qqmlguard_p.h> #include <QtCore/qdir.h> #include <QtCore/qnumeric.h> #include <private/qqmlengine_p.h> #include <private/qqmlvmemetaobject_p.h> -#include <private/qv4compiler_p.h> +#include <private/qqmlcontextwrapper_p.h> #include "testtypes.h" #include "testhttpserver.h" #include "../../shared/util.h" +#include <private/qv4functionobject_p.h> +#include <private/qv4exception_p.h> + +#ifdef Q_CC_MSVC +#define NO_INLINE __declspec(noinline) +#else +#define NO_INLINE __attribute__((noinline)) +#endif + +#if defined(Q_OS_WIN) +#include <malloc.h> +#else +#include <alloca.h> +#endif /* This test covers evaluation of ECMAScript expressions and bindings from within @@ -219,7 +232,6 @@ private slots: void functionAssignment_afterBinding(); void eval(); void function(); - void functionException(); void qtbug_10696(); void qtbug_11606(); void qtbug_11600(); @@ -293,11 +305,28 @@ private slots: void stringParsing(); private: - static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter); +// static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter); static void verifyContextLifetime(QQmlContextData *ctxt); QQmlEngine engine; }; +// The JavaScriptCore GC marks the C stack. To try to ensure that there is +// no JSObject* left in stack memory by the compiler, we call this function +// to zap some bytes of memory before calling collectGarbage(). +static void NO_INLINE zapSomeStack() +{ + char *buf = (char*)alloca(4096); + memset(buf, 0, 4096); +} + +static void gc(QQmlEngine &engine) +{ + zapSomeStack(); + engine.collectGarbage(); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); + QCoreApplication::processEvents(); +} + void tst_qqmlecmascript::initTestCase() { QQmlDataTest::initTestCase(); @@ -546,7 +575,6 @@ void tst_qqmlecmascript::signalArguments() emit object->basicSignal(); QCOMPARE(object->string(), QString("pass")); QCOMPARE(object->property("argumentCount").toInt(), 0); - QCOMPARE(object->property("calleeCorrect").toBool(), true); delete object; } @@ -558,7 +586,6 @@ void tst_qqmlecmascript::signalArguments() emit object->argumentSignal(19, "Hello world!", 10.25, MyQmlObject::EnumValue4, Qt::RightButton); QCOMPARE(object->string(), QString("pass 19 Hello world! 10.25 3 2")); QCOMPARE(object->property("argumentCount").toInt(), 5); - QCOMPARE(object->property("calleeCorrect").toBool(), true); delete object; } } @@ -619,7 +646,7 @@ void tst_qqmlecmascript::methods() void tst_qqmlecmascript::bindingLoop() { QQmlComponent component(&engine, testFileUrl("bindingLoop.qml")); - QString warning = component.url().toString() + ":9:9: QML MyQmlObject: Binding loop detected for property \"stringProperty\""; + QString warning = component.url().toString() + ":5:9: QML MyQmlObject: Binding loop detected for property \"stringProperty\""; QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); QObject *object = component.create(); QVERIFY(object != 0); @@ -858,7 +885,7 @@ void tst_qqmlecmascript::deferredPropertiesErrors() QVERIFY(object->objectProperty() == 0); QVERIFY(object->objectProperty2() == 0); - QString warning = component.url().toString() + ":6: Unable to assign [undefined] to QObject*"; + QString warning = component.url().toString() + ":6:21: Unable to assign [undefined] to QObject*"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); qmlExecuteDeferred(object); @@ -1006,13 +1033,13 @@ void tst_qqmlecmascript::enums() { QUrl file = testFileUrl("enums.2.qml"); QString w1 = QLatin1String("QMetaProperty::read: Unable to handle unregistered datatype 'MyEnum' for property 'MyUnregisteredEnumTypeObject::enumProperty'"); - QString w2 = QLatin1String("QQmlExpression: Expression ") + testFileUrl("enums.2.qml").toString() + QLatin1String(":9 depends on non-NOTIFYable properties:"); + QString w2 = QLatin1String("QQmlExpression: Expression ") + testFileUrl("enums.2.qml").toString() + QLatin1String(":9:21 depends on non-NOTIFYable properties:"); QString w3 = QLatin1String(" MyUnregisteredEnumTypeObject::enumProperty"); - QString w4 = file.toString() + ":7: Unable to assign [undefined] to int"; - QString w5 = file.toString() + ":8: Unable to assign [undefined] to int"; - QString w6 = file.toString() + ":9: Unable to assign [undefined] to int"; - QString w7 = file.toString() + ":13: Unable to assign [undefined] to [unknown property type]"; - QString w8 = file.toString() + ":31: Unable to assign int to [unknown property type]"; + QString w4 = file.toString() + ":7:21: Unable to assign [undefined] to int"; + QString w5 = file.toString() + ":8:21: Unable to assign [undefined] to int"; + QString w6 = file.toString() + ":9:21: Unable to assign [undefined] to int"; + QString w7 = file.toString() + ":13:23: Unable to assign [undefined] to [unknown property type]"; + QString w8 = file.toString() + ":31:23: Unable to assign int to [unknown property type]"; QTest::ignoreMessage(QtWarningMsg, qPrintable(w1)); QTest::ignoreMessage(QtWarningMsg, qPrintable(w2)); QTest::ignoreMessage(QtWarningMsg, qPrintable(w3)); @@ -1206,7 +1233,7 @@ void tst_qqmlecmascript::nonExistentAttachedObject() { QQmlComponent component(&engine, testFileUrl("nonExistentAttachedObject.qml")); - QString warning = component.url().toString() + ":4: Unable to assign [undefined] to QString"; + QString warning = component.url().toString() + ":4:21: Unable to assign [undefined] to QString"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); QObject *object = component.create(); @@ -1257,6 +1284,7 @@ void tst_qqmlecmascript::scope() QVERIFY(object != 0); QCOMPARE(object->property("test1").toBool(), true); + QEXPECT_FAIL("", "Lookup in the global object vs. the QML context is not 100% correct right now ", Continue); QCOMPARE(object->property("test2").toBool(), true); QCOMPARE(object->property("test3").toBool(), true); @@ -1576,9 +1604,9 @@ void tst_qqmlecmascript::dynamicDestruction() { { QQmlComponent component(&engine, testFileUrl("dynamicDeletion.qml")); - QQmlGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create()); + QPointer<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); - QQmlGuard<QObject> createdQmlObject = 0; + QPointer<QObject> createdQmlObject = 0; QMetaObject::invokeMethod(object, "create"); createdQmlObject = object->objectProperty(); @@ -1631,7 +1659,7 @@ void tst_qqmlecmascript::dynamicDestruction() { // QTBUG-23451 - QQmlGuard<QObject> createdQmlObject = 0; + QPointer<QObject> createdQmlObject = 0; QQmlComponent component(&engine, testFileUrl("dynamicDeletion.3.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -1682,6 +1710,7 @@ void tst_qqmlecmascript::objectHasOwnProperty() QVERIFY(object != 0); // test QObjects in QML + QEXPECT_FAIL("", "hasOwnProperty is currently not properly supported for dynamic objects that re-implement get()", Abort); QMetaObject::invokeMethod(object, "testHasOwnPropertySuccess"); QVERIFY(object->property("result").value<bool>() == true); QMetaObject::invokeMethod(object, "testHasOwnPropertyFailure"); @@ -1783,8 +1812,8 @@ void tst_qqmlecmascript::scriptErrors() QString warning3 = url.left(url.length() - 3) + "js:4: Error: Invalid write to global property \"a\""; QString warning4 = url + ":13: ReferenceError: a is not defined"; QString warning5 = url + ":11: ReferenceError: a is not defined"; - QString warning6 = url + ":10: Unable to assign [undefined] to int"; - QString warning7 = url + ":15: Error: Cannot assign to read-only property \"trueProperty\""; + QString warning6 = url + ":10:21: Unable to assign [undefined] to int"; + QString warning7 = url + ":15: TypeError: Cannot assign to read-only property \"trueProperty\""; QString warning8 = url + ":16: Error: Cannot assign to non-existent property \"fakeProperty\""; QTest::ignoreMessage(QtWarningMsg, warning1.toLatin1().constData()); @@ -1829,7 +1858,9 @@ void tst_qqmlecmascript::functionErrors() object = componentTwo.create(); QVERIFY(object != 0); - warning = url + QLatin1String(":16: TypeError: Property 'scarceResource' of object [object Object] is not a function"); + QObject *resource = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>()); + warning = url + QLatin1String(":16: TypeError: Property 'scarceResource' of object ScarceResourceObject(0x%1) is not a function"); + warning = warning.arg(QString::number((qintptr)resource, 16)); QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); // we expect a meaningful warning to be printed. QMetaObject::invokeMethod(object, "retrieveScarceResource"); delete object; @@ -2197,63 +2228,72 @@ void tst_qqmlecmascript::regExpBug() } } -static inline bool evaluate_error(QV8Engine *engine, v8::Handle<v8::Object> o, const char *source) +static inline bool evaluate_error(QV8Engine *engine, const QV4::Value &o, const char *source) { QString functionSource = QLatin1String("(function(object) { return ") + QLatin1String(source) + QLatin1String(" })"); - v8::TryCatch tc; - v8::Local<v8::Script> program = v8::Script::Compile(engine->toString(functionSource)); - if (tc.HasCaught()) - return false; - v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(program->Run()); - if (function.IsEmpty()) - return false; - v8::Handle<v8::Value> args[] = { o }; - function->Call(engine->global(), 1, args); - return tc.HasCaught(); + + QV4::Script program(QV8Engine::getV4(engine)->rootContext, functionSource); + program.inheritContext = true; + + QV4::ExecutionContext *ctx = QV8Engine::getV4(engine)->current; + + try { + QV4::FunctionObject *function = program.run().asFunctionObject(); + if (!function) + return false; + QV4::Value args[] = { o }; + function->call(engine->global(), args, 1); + } catch (QV4::Exception &e) { + e.accept(ctx); + return true; + } + return false; } -static inline bool evaluate_value(QV8Engine *engine, v8::Handle<v8::Object> o, - const char *source, v8::Handle<v8::Value> result) +static inline bool evaluate_value(QV8Engine *engine, const QV4::Value &o, + const char *source, const QV4::Value &result) { QString functionSource = QLatin1String("(function(object) { return ") + QLatin1String(source) + QLatin1String(" })"); - v8::TryCatch tc; - v8::Local<v8::Script> program = v8::Script::Compile(engine->toString(functionSource)); - if (tc.HasCaught()) - return false; - v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(program->Run()); - if (function.IsEmpty()) - return false; - v8::Handle<v8::Value> args[] = { o }; - v8::Handle<v8::Value> value = function->Call(engine->global(), 1, args); + QV4::Script program(QV8Engine::getV4(engine)->rootContext, functionSource); + program.inheritContext = true; - if (tc.HasCaught()) - return false; - - return value->StrictEquals(result); + QV4::ExecutionContext *ctx = QV8Engine::getV4(engine)->current; + try { + QV4::FunctionObject *function = program.run().asFunctionObject(); + if (!function) + return false; + QV4::Value args[] = { o }; + QV4::Value value = function->call(engine->global(), args, 1); + return __qmljs_strict_equal(value, result); + } catch (QV4::Exception &e) { + e.accept(ctx); + } + return false; } -static inline v8::Handle<v8::Value> evaluate(QV8Engine *engine, v8::Handle<v8::Object> o, +static inline QV4::Value evaluate(QV8Engine *engine, const QV4::Value & o, const char *source) { QString functionSource = QLatin1String("(function(object) { return ") + QLatin1String(source) + QLatin1String(" })"); - v8::TryCatch tc; - v8::Local<v8::Script> program = v8::Script::Compile(engine->toString(functionSource)); - if (tc.HasCaught()) - return v8::Handle<v8::Value>(); - v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(program->Run()); - if (function.IsEmpty()) - return v8::Handle<v8::Value>(); - v8::Handle<v8::Value> args[] = { o }; - - v8::Handle<v8::Value> value = function->Call(engine->global(), 1, args); - if (tc.HasCaught()) - return v8::Handle<v8::Value>(); - return value; + QV4::ExecutionContext *ctx = QV8Engine::getV4(engine)->current; + QV4::Script program(QV8Engine::getV4(engine)->rootContext, functionSource); + program.inheritContext = true; + try { + QV4::FunctionObject *function = program.run().asFunctionObject(); + if (!function) + return QV4::Value::emptyValue(); + QV4::Value args[] = { o }; + QV4::Value value = function->call(engine->global(), args, 1); + return value; + } catch (QV4::Exception &e) { + e.accept(ctx); + } + return QV4::Value::emptyValue(); } #define EVALUATE_ERROR(source) evaluate_error(engine, object, source) @@ -2271,10 +2311,7 @@ void tst_qqmlecmascript::callQtInvokables() QV8Engine *engine = ep->v8engine(); - v8::HandleScope handle_scope; - v8::Context::Scope scope(engine->context()); - - v8::Local<v8::Object> object = engine->newQObject(o)->ToObject(); + QV4::Value object = QV4::QObjectWrapper::wrap(QV8Engine::getV4(engine), o); // Non-existent methods o->reset(); @@ -2304,14 +2341,14 @@ void tst_qqmlecmascript::callQtInvokables() // Excessive arguments o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_int(10, 11)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_int(10, 11)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 8); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(10)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_intint(10, 11, 12)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_intint(10, 11, 12)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 9); QCOMPARE(o->actuals().count(), 2); @@ -2320,27 +2357,27 @@ void tst_qqmlecmascript::callQtInvokables() // Test return types o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_NoArgs()", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_NoArgs()", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 0); QCOMPARE(o->actuals().count(), 0); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_NoArgs_int()", v8::Integer::New(6))); + QVERIFY(EVALUATE_VALUE("object.method_NoArgs_int()", QV4::Value::fromInt32(6))); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 1); QCOMPARE(o->actuals().count(), 0); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_NoArgs_real()", v8::Number::New(19.75))); + QVERIFY(EVALUATE_VALUE("object.method_NoArgs_real()", QV4::Value::fromDouble(19.75))); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 2); QCOMPARE(o->actuals().count(), 0); o->reset(); { - v8::Handle<v8::Value> ret = EVALUATE("object.method_NoArgs_QPointF()"); - QVERIFY(!ret.IsEmpty()); + QV4::Value ret = EVALUATE("object.method_NoArgs_QPointF()"); + QVERIFY(!ret.isEmpty()); QCOMPARE(engine->toVariant(ret, -1), QVariant(QPointF(123, 4.5))); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 3); @@ -2349,8 +2386,10 @@ void tst_qqmlecmascript::callQtInvokables() o->reset(); { - v8::Handle<v8::Value> ret = EVALUATE("object.method_NoArgs_QObject()"); - QCOMPARE(engine->toQObject(ret), (QObject *)o); + QV4::Value ret = EVALUATE("object.method_NoArgs_QObject()"); + QV4::QObjectWrapper *qobjectWrapper = ret.as<QV4::QObjectWrapper>(); + QVERIFY(qobjectWrapper); + QCOMPARE(qobjectWrapper->object(), (QObject *)o); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 4); QCOMPARE(o->actuals().count(), 0); @@ -2364,9 +2403,9 @@ void tst_qqmlecmascript::callQtInvokables() o->reset(); { - v8::Handle<v8::Value> ret = EVALUATE("object.method_NoArgs_QScriptValue()"); - QVERIFY(ret->IsString()); - QCOMPARE(engine->toString(ret), QString("Hello world")); + QV4::Value ret = EVALUATE("object.method_NoArgs_QScriptValue()"); + QVERIFY(ret.isString()); + QCOMPARE(ret.toQString(), QString("Hello world")); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 6); QCOMPARE(o->actuals().count(), 0); @@ -2380,49 +2419,49 @@ void tst_qqmlecmascript::callQtInvokables() // Test arg types o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_int(94)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_int(94)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 8); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(94)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_int(\"94\")", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_int(\"94\")", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 8); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(94)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_int(\"not a number\")", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_int(\"not a number\")", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 8); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(0)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_int(null)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_int(null)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 8); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(0)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_int(undefined)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_int(undefined)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 8); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(0)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_int(object)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_int(object)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 8); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(0)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_intint(122, 9)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_intint(122, 9)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 9); QCOMPARE(o->actuals().count(), 2); @@ -2430,56 +2469,56 @@ void tst_qqmlecmascript::callQtInvokables() QCOMPARE(o->actuals().at(1), QVariant(9)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_real(94.3)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_real(94.3)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 10); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(94.3)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_real(\"94.3\")", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_real(\"94.3\")", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 10); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(94.3)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_real(\"not a number\")", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_real(\"not a number\")", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 10); QCOMPARE(o->actuals().count(), 1); QVERIFY(qIsNaN(o->actuals().at(0).toDouble())); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_real(null)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_real(null)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 10); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(0)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_real(undefined)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_real(undefined)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 10); QCOMPARE(o->actuals().count(), 1); QVERIFY(qIsNaN(o->actuals().at(0).toDouble())); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_real(object)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_real(object)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 10); QCOMPARE(o->actuals().count(), 1); QVERIFY(qIsNaN(o->actuals().at(0).toDouble())); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QString(\"Hello world\")", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QString(\"Hello world\")", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 11); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant("Hello world")); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QString(19)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QString(19)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 11); QCOMPARE(o->actuals().count(), 1); @@ -2488,7 +2527,7 @@ void tst_qqmlecmascript::callQtInvokables() o->reset(); { QString expected = "MyInvokableObject(0x" + QString::number((quintptr)o, 16) + ")"; - QVERIFY(EVALUATE_VALUE("object.method_QString(object)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QString(object)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 11); QCOMPARE(o->actuals().count(), 1); @@ -2496,126 +2535,126 @@ void tst_qqmlecmascript::callQtInvokables() } o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QString(null)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QString(null)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 11); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(QString())); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QString(undefined)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QString(undefined)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 11); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(QString())); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QPointF(0)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QPointF(0)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 12); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(QPointF())); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QPointF(null)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QPointF(null)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 12); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(QPointF())); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QPointF(undefined)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QPointF(undefined)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 12); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(QPointF())); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QPointF(object)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QPointF(object)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 12); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(QPointF())); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QPointF(object.method_get_QPointF())", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QPointF(object.method_get_QPointF())", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 12); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(QPointF(99.3, -10.2))); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QPointF(object.method_get_QPoint())", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QPointF(object.method_get_QPoint())", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 12); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(QPointF(9, 12))); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QObject(0)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QObject(0)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 13); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)0)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QObject(\"Hello world\")", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QObject(\"Hello world\")", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 13); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)0)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QObject(null)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QObject(null)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 13); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)0)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QObject(undefined)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QObject(undefined)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 13); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)0)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QObject(object)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QObject(object)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 13); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)o)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(null)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(null)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 14); QCOMPARE(o->actuals().count(), 1); QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(0)).isNull()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(undefined)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(undefined)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 14); QCOMPARE(o->actuals().count(), 1); QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(0)).isUndefined()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(19)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(19)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 14); QCOMPARE(o->actuals().count(), 1); QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(0)).strictlyEquals(QJSValue(19))); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QScriptValue([19, 20])", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QScriptValue([19, 20])", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 14); QCOMPARE(o->actuals().count(), 1); QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(0)).isArray()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(4, null)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(4, null)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 15); QCOMPARE(o->actuals().count(), 2); @@ -2623,7 +2662,7 @@ void tst_qqmlecmascript::callQtInvokables() QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(1)).isNull()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(8, undefined)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(8, undefined)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 15); QCOMPARE(o->actuals().count(), 2); @@ -2631,7 +2670,7 @@ void tst_qqmlecmascript::callQtInvokables() QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(1)).isUndefined()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(3, 19)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(3, 19)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 15); QCOMPARE(o->actuals().count(), 2); @@ -2639,7 +2678,7 @@ void tst_qqmlecmascript::callQtInvokables() QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(1)).strictlyEquals(QJSValue(19))); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(44, [19, 20])", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(44, [19, 20])", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 15); QCOMPARE(o->actuals().count(), 2); @@ -2653,14 +2692,14 @@ void tst_qqmlecmascript::callQtInvokables() QCOMPARE(o->actuals().count(), 0); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_overload(10)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_overload(10)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 16); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(10)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_overload(10, 11)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_overload(10, 11)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 17); QCOMPARE(o->actuals().count(), 2); @@ -2668,21 +2707,21 @@ void tst_qqmlecmascript::callQtInvokables() QCOMPARE(o->actuals().at(1), QVariant(11)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_overload(\"Hello\")", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_overload(\"Hello\")", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 18); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(QString("Hello"))); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_with_enum(9)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_with_enum(9)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 19); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(9)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_default(10)", v8::Integer::New(19))); + QVERIFY(EVALUATE_VALUE("object.method_default(10)", QV4::Value::fromInt32(19))); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 20); QCOMPARE(o->actuals().count(), 2); @@ -2690,7 +2729,7 @@ void tst_qqmlecmascript::callQtInvokables() QCOMPARE(o->actuals().at(1), QVariant(19)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_default(10, 13)", v8::Integer::New(13))); + QVERIFY(EVALUATE_VALUE("object.method_default(10, 13)", QV4::Value::fromInt32(13))); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 20); QCOMPARE(o->actuals().count(), 2); @@ -2698,14 +2737,14 @@ void tst_qqmlecmascript::callQtInvokables() QCOMPARE(o->actuals().at(1), QVariant(13)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_inherited(9)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_inherited(9)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), -3); QCOMPARE(o->actuals().count(), 1); QCOMPARE(o->actuals().at(0), QVariant(9)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QVariant(9)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QVariant(9)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 21); QCOMPARE(o->actuals().count(), 2); @@ -2713,7 +2752,7 @@ void tst_qqmlecmascript::callQtInvokables() QCOMPARE(o->actuals().at(1), QVariant()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QVariant(\"Hello\", \"World\")", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QVariant(\"Hello\", \"World\")", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 21); QCOMPARE(o->actuals().count(), 2); @@ -2721,91 +2760,91 @@ void tst_qqmlecmascript::callQtInvokables() QCOMPARE(o->actuals().at(1), QVariant(QString("World"))); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QJsonObject({foo:123})", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QJsonObject({foo:123})", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 22); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonObject>(o->actuals().at(0)), QJsonDocument::fromJson("{\"foo\":123}").object()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QJsonArray([123])", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QJsonArray([123])", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 23); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonArray>(o->actuals().at(0)), QJsonDocument::fromJson("[123]").array()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(123)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(123)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 24); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(123)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(42.35)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(42.35)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 24); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(42.35)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QJsonValue('ciao')", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QJsonValue('ciao')", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 24); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(QStringLiteral("ciao"))); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(true)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(true)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 24); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(true)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(false)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(false)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 24); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(false)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(null)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(null)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 24); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(QJsonValue::Null)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(undefined)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(undefined)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 24); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(QJsonValue::Undefined)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_overload({foo:123})", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_overload({foo:123})", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 25); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonObject>(o->actuals().at(0)), QJsonDocument::fromJson("{\"foo\":123}").object()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_overload([123])", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_overload([123])", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 26); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonArray>(o->actuals().at(0)), QJsonDocument::fromJson("[123]").array()); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_overload(null)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_overload(null)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 27); QCOMPARE(o->actuals().count(), 1); QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(QJsonValue::Null)); o->reset(); - QVERIFY(EVALUATE_VALUE("object.method_overload(undefined)", v8::Undefined())); + QVERIFY(EVALUATE_VALUE("object.method_overload(undefined)", QV4::Value::undefinedValue())); QCOMPARE(o->error(), false); QCOMPARE(o->invoked(), 27); QCOMPARE(o->actuals().count(), 1); @@ -3264,7 +3303,7 @@ void tst_qqmlecmascript::ownershipRootObject() context->setContextObject(&own); QQmlComponent component(&engine, testFileUrl("ownershipRootObject.qml")); - QQmlGuard<QObject> object = component.create(context); + QPointer<QObject> object = component.create(context); QVERIFY(object); engine.collectGarbage(); @@ -3294,7 +3333,7 @@ void tst_qqmlecmascript::ownershipConsistency() QTest::ignoreMessage(QtWarningMsg, qPrintable(expectedWarning)); // we expect a meaningful warning to be printed. QQmlComponent component(&engine, testFileUrl("ownershipConsistency.qml")); - QQmlGuard<QObject> object = component.create(context); + QPointer<QObject> object = component.create(context); QVERIFY(object); engine.collectGarbage(); @@ -3500,13 +3539,13 @@ void tst_qqmlecmascript::signalWithJSValueInVariant_data() QTest::newRow("'ciao'") << "'ciao'" << compareStrict; QString comparePropertiesStrict( - "(function(a, b) {" + "(function compareMe(a, b) {" " if (typeof b != 'object')" " return a === b;" " var props = Object.getOwnPropertyNames(b);" " for (var i = 0; i < props.length; ++i) {" " var p = props[i];" - " return arguments.callee(a[p], b[p]);" + " return compareMe(a[p], b[p]);" " }" "})"); QTest::newRow("{ foo: 'bar' }") << "({ foo: 'bar' })" << comparePropertiesStrict; @@ -3553,7 +3592,7 @@ void tst_qqmlecmascript::signalWithJSValueInVariant_twoEngines() object->setProperty("compare", compare); object->setProperty("pass", false); - QTest::ignoreMessage(QtWarningMsg, "JSValue can't be rassigned to an another engine."); + QTest::ignoreMessage(QtWarningMsg, "JSValue can't be reassigned to another engine."); emit object->signalWithVariant(QVariant::fromValue(value)); QVERIFY(!object->property("pass").toBool()); } @@ -3645,7 +3684,8 @@ void tst_qqmlecmascript::singletonType_data() QTest::newRow("qobject, writing + readonly constraints") << testFileUrl("singletontype/qobjectSingletonTypeWriting.qml") << QString() - << (QStringList() << QString(testFileUrl("singletontype/qobjectSingletonTypeWriting.qml").toString() + QLatin1String(":15: Error: Cannot assign to read-only property \"qobjectTestProperty\""))) + << (QStringList() << + QString(testFileUrl("singletontype/qobjectSingletonTypeWriting.qml").toString() + QLatin1String(":15: TypeError: Cannot assign to read-only property \"qobjectTestProperty\""))) << (QStringList() << "readOnlyProperty" << "writableProperty" << "writableFinalProperty") << (QVariantList() << 20 << 50 << 10) << (QStringList() << "firstProperty" << "secondProperty") @@ -3656,7 +3696,7 @@ void tst_qqmlecmascript::singletonType_data() QTest::newRow("script, writing + readonly constraints") << testFileUrl("singletontype/scriptSingletonTypeWriting.qml") << QString() - << (QStringList() << QString(testFileUrl("singletontype/scriptSingletonTypeWriting.qml").toString() + QLatin1String(":21: Error: Cannot assign to read-only property \"scriptTestProperty\""))) + << (QStringList()) << (QStringList() << "readBack" << "unchanged") << (QVariantList() << 15 << 42) << (QStringList() << "firstProperty" << "secondProperty") @@ -3808,26 +3848,21 @@ void tst_qqmlecmascript::verifyContextLifetime(QQmlContextData *ctxt) { if (!ctxt->importedScripts.isEmpty()) { QV8Engine *engine = QV8Engine::get(ctxt->engine); - foreach (v8::Persistent<v8::Object> qmlglobal, ctxt->importedScripts) { + foreach (const QV4::PersistentValue& qmlglobal, ctxt->importedScripts) { QQmlContextData *scriptContext, *newContext; - if (qmlglobal.IsEmpty()) + if (qmlglobal.isEmpty()) continue; - scriptContext = engine->contextWrapper()->context(qmlglobal); + scriptContext = QV4::QmlContextWrapper::getContext(qmlglobal); { - v8::HandleScope handle_scope; - v8::Persistent<v8::Context> context = v8::Context::New(); - v8::Context::Scope context_scope(context); - v8::Local<v8::Object> temporaryScope = engine->qmlScope(scriptContext, NULL); + QV4::Value temporaryScope = QV4::QmlContextWrapper::qmlScope(engine, scriptContext, 0); Q_UNUSED(temporaryScope) - - context.Dispose(); } - QV8Engine::gc(); - newContext = engine->contextWrapper()->context(qmlglobal); + engine->gc(); + newContext = QV4::QmlContextWrapper::getContext(qmlglobal); QVERIFY(scriptContext == newContext); } } @@ -3962,7 +3997,7 @@ void tst_qqmlecmascript::importScripts_data() QTest::newRow("malformed import statement") << testFileUrl("jsimportfail/malformedImport.qml") << QString() - << (QStringList() << testFileUrl("jsimportfail/malformedImport.js").toString() + QLatin1String(":1: SyntaxError: Unexpected token .")) + << (QStringList() << testFileUrl("jsimportfail/malformedImport.js").toString() + QLatin1String(":1:1: Syntax error")) << QStringList() << QVariantList(); @@ -4091,6 +4126,7 @@ void tst_qqmlecmascript::scarceResources_other() origPixmap.fill(Qt::blue); QString srp_name, expectedWarning; QQmlEnginePrivate *ep = QQmlEnginePrivate::get(&engine); + QV4::ExecutionEngine *v4 = QV8Engine::getV4(ep->v8engine()); ScarceResourceObject *eo = 0; QObject *srsc = 0; QObject *object = 0; @@ -4116,7 +4152,7 @@ void tst_qqmlecmascript::scarceResources_other() QCOMPARE(srsc->property("scarceResourceCopy").value<QPixmap>(), origPixmap); eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>()); QVERIFY(!(eo->scarceResourceIsDetached())); // should be another copy of the resource now. - QVERIFY(ep->scarceResources.isEmpty()); // should have been released by this point. + QVERIFY(v4->scarceResources.isEmpty()); // should have been released by this point. delete object; // test that scarce resources are handled properly from js functions in qml files @@ -4135,7 +4171,7 @@ void tst_qqmlecmascript::scarceResources_other() QVERIFY(!object->property("scarceResourceCopy").isValid()); // just released, so should not be valid eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>()); QVERIFY(eo->scarceResourceIsDetached()); // should be no other copies of it at this stage. - QVERIFY(ep->scarceResources.isEmpty()); // should have been released by this point. + QVERIFY(v4->scarceResources.isEmpty()); // should have been released by this point. delete object; // test that if an exception occurs while invoking js function from cpp, that the resources are released. @@ -4145,13 +4181,14 @@ void tst_qqmlecmascript::scarceResources_other() QVERIFY(!object->property("scarceResourceCopy").isValid()); // not yet assigned, so should not be valid eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>()); QVERIFY(eo->scarceResourceIsDetached()); // should be no other copies of it at this stage. - expectedWarning = varComponentTwelve.url().toString() + QLatin1String(":16: TypeError: Property 'scarceResource' of object [object Object] is not a function"); + expectedWarning = varComponentTwelve.url().toString() + QLatin1String(":16: TypeError: Property 'scarceResource' of object ScarceResourceObject(0x%1) is not a function"); + expectedWarning = expectedWarning.arg(QString::number((qintptr)eo, 16)); QTest::ignoreMessage(QtWarningMsg, qPrintable(expectedWarning)); // we expect a meaningful warning to be printed. QMetaObject::invokeMethod(object, "retrieveScarceResource"); QVERIFY(!object->property("scarceResourceCopy").isValid()); // due to exception, assignment will NOT have occurred. eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>()); QVERIFY(eo->scarceResourceIsDetached()); // should be no other copies of it at this stage. - QVERIFY(ep->scarceResources.isEmpty()); // should have been released by this point. + QVERIFY(v4->scarceResources.isEmpty()); // should have been released by this point. delete object; // test that if an Item which has JS ownership but has a scarce resource property is garbage collected, @@ -4161,9 +4198,10 @@ void tst_qqmlecmascript::scarceResources_other() QVERIFY(object != 0); QVERIFY(!object->property("varProperty").isValid()); // not assigned yet QMetaObject::invokeMethod(object, "assignVarProperty"); - QVERIFY(ep->scarceResources.isEmpty()); // the scarce resource is a VME property. + QVERIFY(v4->scarceResources.isEmpty()); // the scarce resource is a VME property. QMetaObject::invokeMethod(object, "deassignVarProperty"); - QVERIFY(ep->scarceResources.isEmpty()); // should still be empty; the resource should have been released on gc. + gc(engine); + QVERIFY(v4->scarceResources.isEmpty()); // should still be empty; the resource should have been released on gc. delete object; /* property variant semantics */ @@ -4188,7 +4226,7 @@ void tst_qqmlecmascript::scarceResources_other() QCOMPARE(srsc->property("scarceResourceCopy").value<QPixmap>(), origPixmap); eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>()); QVERIFY(!(eo->scarceResourceIsDetached())); // should be another copy of the resource now. - QVERIFY(ep->scarceResources.isEmpty()); // should have been released by this point. + QVERIFY(v4->scarceResources.isEmpty()); // should have been released by this point. delete object; // test that scarce resources are handled properly from js functions in qml files @@ -4207,7 +4245,7 @@ void tst_qqmlecmascript::scarceResources_other() QVERIFY(!object->property("scarceResourceCopy").isValid()); // just released, so should not be valid eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>()); QVERIFY(eo->scarceResourceIsDetached()); // should be no other copies of it at this stage. - QVERIFY(ep->scarceResources.isEmpty()); // should have been released by this point. + QVERIFY(v4->scarceResources.isEmpty()); // should have been released by this point. delete object; // test that if an exception occurs while invoking js function from cpp, that the resources are released. @@ -4217,13 +4255,14 @@ void tst_qqmlecmascript::scarceResources_other() QVERIFY(!object->property("scarceResourceCopy").isValid()); // not yet assigned, so should not be valid eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>()); QVERIFY(eo->scarceResourceIsDetached()); // should be no other copies of it at this stage. - expectedWarning = variantComponentTwelve.url().toString() + QLatin1String(":16: TypeError: Property 'scarceResource' of object [object Object] is not a function"); + expectedWarning = variantComponentTwelve.url().toString() + QLatin1String(":16: TypeError: Property 'scarceResource' of object ScarceResourceObject(0x%1) is not a function"); + expectedWarning = expectedWarning.arg(QString::number((qintptr)eo, 16)); QTest::ignoreMessage(QtWarningMsg, qPrintable(expectedWarning)); // we expect a meaningful warning to be printed. QMetaObject::invokeMethod(object, "retrieveScarceResource"); QVERIFY(!object->property("scarceResourceCopy").isValid()); // due to exception, assignment will NOT have occurred. eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>()); QVERIFY(eo->scarceResourceIsDetached()); // should be no other copies of it at this stage. - QVERIFY(ep->scarceResources.isEmpty()); // should have been released by this point. + QVERIFY(v4->scarceResources.isEmpty()); // should have been released by this point. delete object; } @@ -4459,6 +4498,7 @@ void tst_qqmlecmascript::scarceResources() QFETCH(QStringList, expectedErrors); QQmlEnginePrivate *ep = QQmlEnginePrivate::get(&engine); + QV4::ExecutionEngine *v4 = QV8Engine::getV4(ep->v8engine()); ScarceResourceObject *eo = 0; QObject *object = 0; @@ -4483,7 +4523,7 @@ void tst_qqmlecmascript::scarceResources() QCOMPARE(eo->scarceResourceIsDetached(), expectedDetachStatus); } - QVERIFY(ep->scarceResources.isEmpty()); + QVERIFY(v4->scarceResources.isEmpty()); delete object; } @@ -4631,13 +4671,6 @@ void tst_qqmlecmascript::propertyVarCpp() delete object; } -static void gc(QQmlEngine &engine) -{ - engine.collectGarbage(); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QCoreApplication::processEvents(); -} - void tst_qqmlecmascript::propertyVarOwnership() { // Referenced JS objects are not collected @@ -4738,8 +4771,7 @@ void tst_qqmlecmascript::propertyVarImplicitOwnership() QCoreApplication::processEvents(); QVERIFY(!qobjectGuard.isNull()); QMetaObject::invokeMethod(object, "deassignCircular"); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); // process deleteLater() events from QV8QObjectWrapper. - QCoreApplication::processEvents(); + gc(engine); QVERIFY(qobjectGuard.isNull()); // should have been collected now. delete object; } @@ -4773,15 +4805,13 @@ void tst_qqmlecmascript::propertyVarReparent() // now reparent the "Image" object (currently, it has JS ownership) image->setParent(text); // shouldn't be collected after deassignVp now, since has a parent. QMetaObject::invokeMethod(text2, "deassignVp"); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); // process deleteLater() events from QV8QObjectWrapper. - QCoreApplication::processEvents(); + gc(engine); QCOMPARE(text->property("textCanary").toInt(), 11); QCOMPARE(text2->property("textCanary").toInt(), 22); QVERIFY(!imageGuard.isNull()); // should still be alive. QCOMPARE(image->property("imageCanary").toInt(), 13); // still able to access var properties QMetaObject::invokeMethod(object, "deassignVarProp"); // now deassign the root-object's vp, causing gc of rect+text+text2 - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); // process deleteLater() events from QV8QObjectWrapper. - QCoreApplication::processEvents(); + gc(engine); QVERIFY(imageGuard.isNull()); // should now have been deleted, due to parent being deleted. delete object; } @@ -4817,8 +4847,7 @@ void tst_qqmlecmascript::propertyVarReparentNullContext() // now reparent the "Image" object (currently, it has JS ownership) image->setParent(object); // reparented to base object. after deassignVarProp, the ctxt will be invalid. QMetaObject::invokeMethod(object, "deassignVarProp"); // now deassign the root-object's vp, causing gc of rect+text+text2 - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); // process deleteLater() events from QV8QObjectWrapper. - QCoreApplication::processEvents(); + gc(engine); QVERIFY(!imageGuard.isNull()); // should still be alive. QVERIFY(!image->property("imageCanary").isValid()); // but varProperties won't be available (null context). delete object; @@ -4840,12 +4869,10 @@ void tst_qqmlecmascript::propertyVarCircular() QPixmap canaryResourcePixmap = canaryResourceVariant.value<QPixmap>(); canaryResourceVariant = QVariant(); // invalidate it to remove one copy of the pixmap from memory. QMetaObject::invokeMethod(object, "deassignCanaryResource"); // remove one copy of the pixmap from memory - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); // process deleteLater() events from QV8QObjectWrapper. - QCoreApplication::processEvents(); + gc(engine); QVERIFY(!canaryResourcePixmap.isDetached()); // two copies extant - this and the propertyVar.vp.vp.vp.vp.memoryHog. QMetaObject::invokeMethod(object, "deassignCircular"); // cause deassignment and gc - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); // process deleteLater() events from QV8QObjectWrapper. - QCoreApplication::processEvents(); + gc(engine); QCOMPARE(object->property("canaryInt"), QVariant(2)); QCOMPARE(object->property("canaryResource"), QVariant(1)); QVERIFY(canaryResourcePixmap.isDetached()); // now detached, since orig copy was member of qdvmemo which was deleted. @@ -4874,23 +4901,22 @@ void tst_qqmlecmascript::propertyVarCircular2() QCOMPARE(rootObject->property("rectCanary").toInt(), 5); QCOMPARE(childObject->property("textCanary").toInt(), 10); QMetaObject::invokeMethod(object, "deassignCircular"); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); // process deleteLater() events from QV8QObjectWrapper. - QCoreApplication::processEvents(); + gc(engine); QVERIFY(rootObjectTracker.isNull()); // should have been collected QVERIFY(childObjectTracker.isNull()); // should have been collected delete object; } -void tst_qqmlecmascript::propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter) -{ - *(int*)(parameter) += 1; - qPersistentDispose(object); -} +#if defined(Q_CC_GNU) +#if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404 +#define pop_gcc_flags +#pragma GCC push_options +#pragma GCC optimize ("O0") +#endif +#endif void tst_qqmlecmascript::propertyVarInheritance() { - int propertyVarWeakRefCallbackCount = 0; - // enforce behaviour regarding element inheritance - ensure handle disposal. // The particular component under test here has a chain of references. QQmlComponent component(&engine, testFileUrl("propertyVar.inherit.qml")); @@ -4902,30 +4928,38 @@ void tst_qqmlecmascript::propertyVarInheritance() // we want to be able to track when the varProperties array of the last metaobject is disposed QObject *cco5 = object->property("varProperty").value<QObject*>()->property("vp").value<QObject*>()->property("vp").value<QObject*>()->property("vp").value<QObject*>()->property("vp").value<QObject*>(); QObject *ico5 = object->property("varProperty").value<QObject*>()->property("inheritanceVarProperty").value<QObject*>()->property("vp").value<QObject*>()->property("vp").value<QObject*>()->property("vp").value<QObject*>()->property("vp").value<QObject*>(); + QVERIFY(cco5); + QVERIFY(ico5); QQmlVMEMetaObject *icovmemo = QQmlVMEMetaObject::get(ico5); QQmlVMEMetaObject *ccovmemo = QQmlVMEMetaObject::get(cco5); - v8::Persistent<v8::Value> icoCanaryHandle; - v8::Persistent<v8::Value> ccoCanaryHandle; + QV4::WeakValue icoCanaryHandle; + QV4::WeakValue ccoCanaryHandle; { - v8::HandleScope hs; // XXX NOTE: this is very implementation dependent. QDVMEMO->vmeProperty() is the only // public function which can return us a handle to something in the varProperties array. - icoCanaryHandle = qPersistentNew(icovmemo->vmeProperty(ico5->metaObject()->indexOfProperty("circ"))); - ccoCanaryHandle = qPersistentNew(ccovmemo->vmeProperty(cco5->metaObject()->indexOfProperty("circ"))); - // we make them weak and invoke the gc, but we should not hit the weak-callback yet - // as the varproperties array of each vmemo still references the resource. - icoCanaryHandle.MakeWeak(&propertyVarWeakRefCallbackCount, propertyVarWeakRefCallback); - ccoCanaryHandle.MakeWeak(&propertyVarWeakRefCallbackCount, propertyVarWeakRefCallback); + QV4::Value tmp = icovmemo->vmeProperty(ico5->metaObject()->indexOfProperty("circ")); + icoCanaryHandle = tmp; + tmp = ccovmemo->vmeProperty(cco5->metaObject()->indexOfProperty("circ")); + ccoCanaryHandle = tmp; + tmp = QV4::Value::nullValue(); + QVERIFY(!icoCanaryHandle.isEmpty()); + QVERIFY(!ccoCanaryHandle.isEmpty()); gc(engine); - QVERIFY(propertyVarWeakRefCallbackCount == 0); + QVERIFY(!icoCanaryHandle.isEmpty()); + QVERIFY(!ccoCanaryHandle.isEmpty()); } // now we deassign the var prop, which should trigger collection of item subtrees. QMetaObject::invokeMethod(object, "deassignCircular"); // cause deassignment and gc - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); // process deleteLater() events from QV8QObjectWrapper. - QCoreApplication::processEvents(); // ensure that there are only weak handles to the underlying varProperties array remaining. gc(engine); - QCOMPARE(propertyVarWeakRefCallbackCount, 2); // should have been called for both, since all refs should be weak. + // an equivalent for pragma GCC optimize is still work-in-progress for CLang, so this test will fail. +#if defined(Q_CC_MSVC) + QSKIP("This test does not work reliably with MSVC."); +#endif +#if !defined(Q_CC_CLANG) + QVERIFY(icoCanaryHandle.isEmpty()); + QVERIFY(ccoCanaryHandle.isEmpty()); +#endif delete object; // since there are no parent vmemo's to keep implicit references alive, and the only handles // to what remains are weak, all varProperties arrays must have been collected. @@ -4933,8 +4967,6 @@ void tst_qqmlecmascript::propertyVarInheritance() void tst_qqmlecmascript::propertyVarInheritance2() { - int propertyVarWeakRefCallbackCount = 0; - // The particular component under test here does NOT have a chain of references; the // only link between rootObject and childObject is that rootObject is the parent of childObject. QQmlComponent component(&engine, testFileUrl("propertyVar.circular.2.qml")); @@ -4949,24 +4981,31 @@ void tst_qqmlecmascript::propertyVarInheritance2() QVERIFY(childObject != 0); QCOMPARE(rootObject->property("rectCanary").toInt(), 5); QCOMPARE(childObject->property("textCanary").toInt(), 10); - v8::Persistent<v8::Value> childObjectVarArrayValueHandle; + QV4::WeakValue childObjectVarArrayValueHandle; { - v8::HandleScope hs; - propertyVarWeakRefCallbackCount = 0; // reset callback count. - childObjectVarArrayValueHandle = qPersistentNew(QQmlVMEMetaObject::get(childObject)->vmeProperty(childObject->metaObject()->indexOfProperty("vp"))); - childObjectVarArrayValueHandle.MakeWeak(&propertyVarWeakRefCallbackCount, propertyVarWeakRefCallback); + QV4::Value tmp = QQmlVMEMetaObject::get(childObject)->vmeProperty(childObject->metaObject()->indexOfProperty("vp")); + childObjectVarArrayValueHandle = tmp; + tmp = QV4::Value::nullValue(); + QVERIFY(!childObjectVarArrayValueHandle.isEmpty()); gc(engine); - QVERIFY(propertyVarWeakRefCallbackCount == 0); // should not have been collected yet. + QVERIFY(!childObjectVarArrayValueHandle.isEmpty()); // should not have been collected yet. QCOMPARE(childObject->property("vp").value<QObject*>(), rootObject); QCOMPARE(childObject->property("textCanary").toInt(), 10); } QMetaObject::invokeMethod(object, "deassignCircular"); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); // process deleteLater() events from QV8QObjectWrapper. - QCoreApplication::processEvents(); - QVERIFY(propertyVarWeakRefCallbackCount == 1); // should have been collected now. + gc(engine); + // an equivalent for pragma GCC optimize is still work-in-progress for CLang, so this test will fail. +#if !defined(Q_CC_CLANG) + QVERIFY(childObjectVarArrayValueHandle.isEmpty()); // should have been collected now. +#endif delete object; } +#if defined(pop_gcc_flags) +#pragma GCC pop_options +#endif + + // Ensure that QObject type conversion works on binding assignment void tst_qqmlecmascript::elementAssign() { @@ -5031,7 +5070,6 @@ void tst_qqmlecmascript::booleanConversion() void tst_qqmlecmascript::handleReferenceManagement() { - int dtorCount = 0; { // Linear QObject reference @@ -5043,7 +5081,7 @@ void tst_qqmlecmascript::handleReferenceManagement() cro->setEngine(&hrmEngine); cro->setDtorCount(&dtorCount); QMetaObject::invokeMethod(object, "createReference"); - gc(engine); + gc(hrmEngine); QCOMPARE(dtorCount, 0); // second has JS ownership, kept alive by first's reference delete object; hrmEngine.collectGarbage(); @@ -5063,7 +5101,7 @@ void tst_qqmlecmascript::handleReferenceManagement() cro->setEngine(&hrmEngine); cro->setDtorCount(&dtorCount); QMetaObject::invokeMethod(object, "circularReference"); - gc(engine); + gc(hrmEngine); QCOMPARE(dtorCount, 2); // both should be cleaned up, since circular references shouldn't keep alive. delete object; hrmEngine.collectGarbage(); @@ -5072,230 +5110,6 @@ void tst_qqmlecmascript::handleReferenceManagement() QCOMPARE(dtorCount, 3); } - dtorCount = 0; - { - // Linear handle reference - QQmlEngine hrmEngine; - QQmlComponent component(&hrmEngine, testFileUrl("handleReferenceManagement.handle.1.qml")); - QObject *object = component.create(); - QVERIFY(object != 0); - CircularReferenceHandle *crh = object->findChild<CircularReferenceHandle*>("crh"); - QVERIFY(crh != 0); - crh->setEngine(&hrmEngine); - crh->setDtorCount(&dtorCount); - QMetaObject::invokeMethod(object, "createReference"); - CircularReferenceHandle *first = object->property("first").value<CircularReferenceHandle*>(); - CircularReferenceHandle *second = object->property("second").value<CircularReferenceHandle*>(); - QVERIFY(first != 0); - QVERIFY(second != 0); - first->addReference(QQmlData::get(second)->v8object); // create reference - // now we have to reparent second and make second owned by JS. - second->setParent(0); - QQmlEngine::setObjectOwnership(second, QQmlEngine::JavaScriptOwnership); - gc(engine); - QCOMPARE(dtorCount, 0); // due to reference from first to second, second shouldn't be collected. - delete object; - hrmEngine.collectGarbage(); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QCoreApplication::processEvents(); - QCOMPARE(dtorCount, 3); - } - - dtorCount = 0; - { - // Circular handle reference - QQmlEngine hrmEngine; - QQmlComponent component(&hrmEngine, testFileUrl("handleReferenceManagement.handle.2.qml")); - QObject *object = component.create(); - QVERIFY(object != 0); - CircularReferenceHandle *crh = object->findChild<CircularReferenceHandle*>("crh"); - QVERIFY(crh != 0); - crh->setEngine(&hrmEngine); - crh->setDtorCount(&dtorCount); - QMetaObject::invokeMethod(object, "circularReference"); - CircularReferenceHandle *first = object->property("first").value<CircularReferenceHandle*>(); - CircularReferenceHandle *second = object->property("second").value<CircularReferenceHandle*>(); - QVERIFY(first != 0); - QVERIFY(second != 0); - first->addReference(QQmlData::get(second)->v8object); // create circular reference - second->addReference(QQmlData::get(first)->v8object); // note: must be weak. - // now we have to reparent and change ownership, and unset the property references. - first->setParent(0); - second->setParent(0); - QQmlEngine::setObjectOwnership(first, QQmlEngine::JavaScriptOwnership); - QQmlEngine::setObjectOwnership(second, QQmlEngine::JavaScriptOwnership); - object->setProperty("first", QVariant::fromValue<QObject*>(0)); - object->setProperty("second", QVariant::fromValue<QObject*>(0)); - gc(engine); - QCOMPARE(dtorCount, 2); // despite circular references, both will be collected. - delete object; - hrmEngine.collectGarbage(); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QCoreApplication::processEvents(); - QCOMPARE(dtorCount, 3); - } - - dtorCount = 0; - { - // multiple engine interaction - linear reference - QQmlEngine hrmEngine1; - QQmlEngine hrmEngine2; - QQmlComponent component1(&hrmEngine1, testFileUrl("handleReferenceManagement.handle.1.qml")); - QQmlComponent component2(&hrmEngine2, testFileUrl("handleReferenceManagement.handle.1.qml")); - QObject *object1 = component1.create(); - QObject *object2 = component2.create(); - QVERIFY(object1 != 0); - QVERIFY(object2 != 0); - CircularReferenceHandle *crh1 = object1->findChild<CircularReferenceHandle*>("crh"); - CircularReferenceHandle *crh2 = object2->findChild<CircularReferenceHandle*>("crh"); - QVERIFY(crh1 != 0); - QVERIFY(crh2 != 0); - crh1->setEngine(&hrmEngine1); - crh2->setEngine(&hrmEngine2); - crh1->setDtorCount(&dtorCount); - crh2->setDtorCount(&dtorCount); - QMetaObject::invokeMethod(object1, "createReference"); - QMetaObject::invokeMethod(object2, "createReference"); - CircularReferenceHandle *first1 = object1->property("first").value<CircularReferenceHandle*>(); - CircularReferenceHandle *second1 = object1->property("second").value<CircularReferenceHandle*>(); - CircularReferenceHandle *first2 = object2->property("first").value<CircularReferenceHandle*>(); - CircularReferenceHandle *second2 = object2->property("second").value<CircularReferenceHandle*>(); - QVERIFY(first1 != 0); - QVERIFY(second1 != 0); - QVERIFY(first2 != 0); - QVERIFY(second2 != 0); - first1->addReference(QQmlData::get(second2)->v8object); // create reference across engines - // now we have to reparent second2 and make second2 owned by JS. - second2->setParent(0); - QQmlEngine::setObjectOwnership(second2, QQmlEngine::JavaScriptOwnership); - gc(engine); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QCoreApplication::processEvents(); - QCOMPARE(dtorCount, 0); // due to reference from first1 to second2, second2 shouldn't be collected. - delete object1; - delete object2; - hrmEngine1.collectGarbage(); - hrmEngine2.collectGarbage(); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QCoreApplication::processEvents(); - QCOMPARE(dtorCount, 6); - } - - dtorCount = 0; - { - // multiple engine interaction - circular reference - QQmlEngine hrmEngine1; - QQmlEngine hrmEngine2; - QQmlComponent component1(&hrmEngine1, testFileUrl("handleReferenceManagement.handle.1.qml")); - QQmlComponent component2(&hrmEngine2, testFileUrl("handleReferenceManagement.handle.1.qml")); - QObject *object1 = component1.create(); - QObject *object2 = component2.create(); - QVERIFY(object1 != 0); - QVERIFY(object2 != 0); - CircularReferenceHandle *crh1 = object1->findChild<CircularReferenceHandle*>("crh"); - CircularReferenceHandle *crh2 = object2->findChild<CircularReferenceHandle*>("crh"); - QVERIFY(crh1 != 0); - QVERIFY(crh2 != 0); - crh1->setEngine(&hrmEngine1); - crh2->setEngine(&hrmEngine2); - crh1->setDtorCount(&dtorCount); - crh2->setDtorCount(&dtorCount); - QMetaObject::invokeMethod(object1, "createReference"); - QMetaObject::invokeMethod(object2, "createReference"); - CircularReferenceHandle *first1 = object1->property("first").value<CircularReferenceHandle*>(); - CircularReferenceHandle *second1 = object1->property("second").value<CircularReferenceHandle*>(); - CircularReferenceHandle *first2 = object2->property("first").value<CircularReferenceHandle*>(); - CircularReferenceHandle *second2 = object2->property("second").value<CircularReferenceHandle*>(); - QVERIFY(first1 != 0); - QVERIFY(second1 != 0); - QVERIFY(first2 != 0); - QVERIFY(second2 != 0); - first1->addReference(QQmlData::get(second1)->v8object); // create linear reference within engine1 - second1->addReference(QQmlData::get(second2)->v8object); // create linear reference across engines - second2->addReference(QQmlData::get(first2)->v8object); // create linear reference within engine2 - first2->addReference(QQmlData::get(first1)->v8object); // close the loop - circular ref across engines - // now we have to reparent and change ownership to JS, and remove property references. - first1->setParent(0); - second1->setParent(0); - first2->setParent(0); - second2->setParent(0); - QQmlEngine::setObjectOwnership(first1, QQmlEngine::JavaScriptOwnership); - QQmlEngine::setObjectOwnership(second1, QQmlEngine::JavaScriptOwnership); - QQmlEngine::setObjectOwnership(first2, QQmlEngine::JavaScriptOwnership); - QQmlEngine::setObjectOwnership(second2, QQmlEngine::JavaScriptOwnership); - object1->setProperty("first", QVariant::fromValue<QObject*>(0)); - object1->setProperty("second", QVariant::fromValue<QObject*>(0)); - object2->setProperty("first", QVariant::fromValue<QObject*>(0)); - object2->setProperty("second", QVariant::fromValue<QObject*>(0)); - gc(engine); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QCoreApplication::processEvents(); - QCOMPARE(dtorCount, 4); // circular references shouldn't keep them alive. - delete object1; - delete object2; - hrmEngine1.collectGarbage(); - hrmEngine2.collectGarbage(); - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QCoreApplication::processEvents(); - QCOMPARE(dtorCount, 6); - } - - dtorCount = 0; - { - // multiple engine interaction - linear reference with engine deletion - QQmlEngine *hrmEngine1 = new QQmlEngine; - QQmlEngine *hrmEngine2 = new QQmlEngine; - QQmlComponent component1(hrmEngine1, testFileUrl("handleReferenceManagement.handle.1.qml")); - QQmlComponent component2(hrmEngine2, testFileUrl("handleReferenceManagement.handle.1.qml")); - QObject *object1 = component1.create(); - QObject *object2 = component2.create(); - QVERIFY(object1 != 0); - QVERIFY(object2 != 0); - CircularReferenceHandle *crh1 = object1->findChild<CircularReferenceHandle*>("crh"); - CircularReferenceHandle *crh2 = object2->findChild<CircularReferenceHandle*>("crh"); - QVERIFY(crh1 != 0); - QVERIFY(crh2 != 0); - crh1->setEngine(hrmEngine1); - crh2->setEngine(hrmEngine2); - crh1->setDtorCount(&dtorCount); - crh2->setDtorCount(&dtorCount); - QMetaObject::invokeMethod(object1, "createReference"); - QMetaObject::invokeMethod(object2, "createReference"); - CircularReferenceHandle *first1 = object1->property("first").value<CircularReferenceHandle*>(); - CircularReferenceHandle *second1 = object1->property("second").value<CircularReferenceHandle*>(); - CircularReferenceHandle *first2 = object2->property("first").value<CircularReferenceHandle*>(); - CircularReferenceHandle *second2 = object2->property("second").value<CircularReferenceHandle*>(); - QVERIFY(first1 != 0); - QVERIFY(second1 != 0); - QVERIFY(first2 != 0); - QVERIFY(second2 != 0); - first1->addReference(QQmlData::get(second1)->v8object); // create linear reference within engine1 - second1->addReference(QQmlData::get(second2)->v8object); // create linear reference across engines - second2->addReference(QQmlData::get(first2)->v8object); // create linear reference within engine2 - // now we have to reparent and change ownership to JS. - first1->setParent(crh1); - second1->setParent(0); - first2->setParent(0); - second2->setParent(0); - QQmlEngine::setObjectOwnership(second1, QQmlEngine::JavaScriptOwnership); - QQmlEngine::setObjectOwnership(first2, QQmlEngine::JavaScriptOwnership); - QQmlEngine::setObjectOwnership(second2, QQmlEngine::JavaScriptOwnership); - gc(*hrmEngine1); - gc(*hrmEngine2); - QCOMPARE(dtorCount, 0); - delete hrmEngine2; // should trigger deletion of objects with JS ownership tracked by this engine - gc(*hrmEngine1); - QCOMPARE(dtorCount, 2); // first2 and second2 should have been deleted. - delete object1; - delete object2; - gc(*hrmEngine1); - QCOMPARE(dtorCount, 6); // deleting object1 and object2 should trigger deletion of first1 and first2. - delete hrmEngine1; - QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QCoreApplication::processEvents(); - QCOMPARE(dtorCount, 6); // all objects should have been cleaned up prior to deleting hrmEngine1. - } - { // Dynamic variant property reference keeps target alive QQmlEngine hrmEngine; @@ -5303,11 +5117,11 @@ void tst_qqmlecmascript::handleReferenceManagement() QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "createReference"); - gc(engine); + gc(hrmEngine); QMetaObject::invokeMethod(object, "ensureReference"); - gc(engine); + gc(hrmEngine); QMetaObject::invokeMethod(object, "removeReference"); - gc(engine); + gc(hrmEngine); QMetaObject::invokeMethod(object, "ensureDeletion"); QCOMPARE(object->property("success").toBool(), true); delete object; @@ -5320,11 +5134,11 @@ void tst_qqmlecmascript::handleReferenceManagement() QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "createReference"); - gc(engine); + gc(hrmEngine); QMetaObject::invokeMethod(object, "ensureReference"); - gc(engine); + gc(hrmEngine); QMetaObject::invokeMethod(object, "removeReference"); - gc(engine); + gc(hrmEngine); QMetaObject::invokeMethod(object, "ensureDeletion"); QCOMPARE(object->property("success").toBool(), true); delete object; @@ -5337,11 +5151,11 @@ void tst_qqmlecmascript::handleReferenceManagement() QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "createReference"); - gc(engine); + gc(hrmEngine); QMetaObject::invokeMethod(object, "ensureReference"); - gc(engine); + gc(hrmEngine); QMetaObject::invokeMethod(object, "manuallyDelete"); - gc(engine); + gc(hrmEngine); QMetaObject::invokeMethod(object, "ensureDeleted"); QCOMPARE(object->property("success").toBool(), true); delete object; @@ -5602,7 +5416,7 @@ void tst_qqmlecmascript::sequenceConversionBindings() { QUrl qmlFile = testFileUrl("sequenceConversion.bindings.error.qml"); - QString warning = QString(QLatin1String("%1:17: Unable to assign QList<int> to QList<bool>")).arg(qmlFile.toString()); + QString warning = QString(QLatin1String("%1:17:27: Unable to assign QList<int> to QList<bool>")).arg(qmlFile.toString()); QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); QQmlComponent component(&engine, qmlFile); QObject *object = component.create(); @@ -5821,7 +5635,7 @@ void tst_qqmlecmascript::qtbug_9792() delete object; } -// Verifies that QQmlGuard<>s used in the vmemetaobject are cleaned correctly +// Verifies that QPointer<>s used in the vmemetaobject are cleaned correctly void tst_qqmlecmascript::qtcreatorbug_1289() { QQmlComponent component(&engine, testFileUrl("qtcreatorbug_1289.qml")); @@ -5969,11 +5783,11 @@ void tst_qqmlecmascript::functionAssignmentfromJS_invalid() QVERIFY(!o->property("a").isValid()); QString url = component.url().toString(); - QString warning = url + ":67:17: Unable to assign QString to int"; + QString warning = url + ":67: Unable to assign QString to int"; QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); o->setProperty("assignWrongType", true); - warning = url + ":71:29: Unable to assign QString to int"; + warning = url + ":71: Unable to assign QString to int"; QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); o->setProperty("assignWrongTypeToValueType", true); @@ -6026,19 +5840,6 @@ void tst_qqmlecmascript::function() delete o; } -void tst_qqmlecmascript::functionException() -{ - // QTBUG-24037 - shouldn't crash. - QString errstr = testFileUrl("v8functionException.qml").toString() + QLatin1String(":13: SyntaxError: Unexpected token ILLEGAL"); - QTest::ignoreMessage(QtWarningMsg, qPrintable(errstr)); - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: Exception occurred during compilation of function: dynamicSlot()"); - QQmlComponent component(&engine, testFileUrl("v8functionException.qml")); - QObject *o = component.create(); - QVERIFY(o != 0); - QMetaObject::invokeMethod(o, "dynamicSlot"); - delete o; -} - // Test the "Qt.include" method void tst_qqmlecmascript::include() { @@ -6704,9 +6505,7 @@ void tst_qqmlecmascript::doubleEvaluate() void tst_qqmlecmascript::nonNotifyable() { - QV4Compiler::enableV4(false); QQmlComponent component(&engine, testFileUrl("nonNotifyable.qml")); - QV4Compiler::enableV4(true); QQmlTestMessageHandler messageHandler; @@ -6716,7 +6515,7 @@ void tst_qqmlecmascript::nonNotifyable() QString expected1 = QLatin1String("QQmlExpression: Expression ") + component.url().toString() + - QLatin1String(":5 depends on non-NOTIFYable properties:"); + QLatin1String(":5:24 depends on non-NOTIFYable properties:"); QString expected2 = QLatin1String(" ") + QLatin1String(object->metaObject()->className()) + QLatin1String("::value"); @@ -6791,8 +6590,8 @@ void tst_qqmlecmascript::qtbug_22843() QQmlComponent component(&engine, testFileUrl(fileName)); QString url = component.url().toString(); - QString warning1 = url.left(url.length()-3) + QLatin1String("js:4: SyntaxError: Unexpected token )"); - QString warning2 = url + QLatin1String(":5: TypeError: Object [object Object] has no method 'func'"); + QString warning1 = url.left(url.length()-3) + QLatin1String("js:4:16: Expected token `;'"); + QString warning2 = url + QLatin1String(":5: TypeError: Property 'func' of object NaN is not a function"); qRegisterMetaType<QList<QQmlError> >("QList<QQmlError>"); QSignalSpy warningsSpy(&engine, SIGNAL(warnings(QList<QQmlError>))); @@ -6887,7 +6686,7 @@ void tst_qqmlecmascript::switchStatement() { QQmlComponent component(&engine, testFileUrl("switchStatement.4.qml")); - QString warning = component.url().toString() + ":4: Unable to assign [undefined] to int"; + QString warning = component.url().toString() + ":4:12: Unable to assign [undefined] to int"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); @@ -6962,7 +6761,8 @@ void tst_qqmlecmascript::switchStatement() void tst_qqmlecmascript::withStatement() { { - QQmlComponent component(&engine, testFileUrl("withStatement.1.qml")); + QUrl url = testFileUrl("withStatement.1.qml"); + QQmlComponent component(&engine, url); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 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/qqmlinstruction/tst_qqmlinstruction.cpp b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp index 925eec9403..44ab690f68 100644 --- a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp +++ b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp @@ -323,15 +323,6 @@ void tst_qqmlinstruction::dump() } { - QQmlCompiledData::Instruction::StoreV4Binding i; - i.property = 27; - i.value = 2; - i.context = 4; - i.owner = 0; - data->addInstruction(i); - } - - { QQmlCompiledData::Instruction::StoreValueSource i; i.property.coreIndex = 29; i.castValue = 4; @@ -531,32 +522,31 @@ void tst_qqmlinstruction::dump() << "29\t\tASSIGN_SIGNAL_OBJECT\t4" << "30\t\tASSIGN_CUSTOMTYPE\t25\t6\t9" << "31\t\tSTORE_BINDING\t26\t3\t2" - << "32\t\tSTORE_COMPILED_BINDING\t27\t2\t4" - << "33\t\tSTORE_VALUE_SOURCE\t29\t4" - << "34\t\tSTORE_VALUE_INTERCEPTOR\t30\t-4" - << "35\t\tBEGIN\t\t\t4" - << "36\t\tSTORE_OBJECT_QLIST" - << "37\t\tASSIGN_OBJECT_LIST" - << "38\t\tFETCH_ATTACHED\t\t23" - << "39\t\tFETCH_QLIST\t\t32" - << "40\t\tFETCH\t\t\t33" - << "41\t\tFETCH_VALUE\t\t34\t6\t7" - << "42\t\tPOP" - << "43\t\tPOP_QLIST" - << "44\t\tPOP_VALUE\t\t35\t8" + << "32\t\tSTORE_VALUE_SOURCE\t29\t4" + << "33\t\tSTORE_VALUE_INTERCEPTOR\t30\t-4" + << "34\t\tBEGIN\t\t\t4" + << "35\t\tSTORE_OBJECT_QLIST" + << "36\t\tASSIGN_OBJECT_LIST" + << "37\t\tFETCH_ATTACHED\t\t23" + << "38\t\tFETCH_QLIST\t\t32" + << "39\t\tFETCH\t\t\t33" + << "40\t\tFETCH_VALUE\t\t34\t6\t7" + << "41\t\tPOP" + << "42\t\tPOP_QLIST" + << "43\t\tPOP_VALUE\t\t35\t8" + << "44\t\tDEFER\t\t\t7" << "45\t\tDEFER\t\t\t7" - << "46\t\tDEFER\t\t\t7" - << "47\t\tSTORE_IMPORTED_SCRIPT\t2" - << "48\t\tSTORE_VARIANT_INTEGER\t\t32\t11" - << "49\t\tSTORE_VARIANT_DOUBLE\t\t19\t33.7" - << "50\t\tDONE" - << "51\t\tSTORE_TR_STRING\t99\t3\t14\t14\t2" - << "52\t\tSTORE_TRID_STRING\t78\t7\t-1" - << "53\t\tSTORE_VAR\t\t79\t5\t\t\"color(1, 1, 1, 1)\"" - << "54\t\tSTORE_VAR_OBJECT\t80" - << "55\t\tSTORE_VAR_INTEGER\t81\t23" - << "56\t\tSTORE_VAR_DOUBLE\t82\t66.3" - << "57\t\tSTORE_VAR_BOOL\t\t83\ttrue" + << "46\t\tSTORE_IMPORTED_SCRIPT\t2" + << "47\t\tSTORE_VARIANT_INTEGER\t\t32\t11" + << "48\t\tSTORE_VARIANT_DOUBLE\t\t19\t33.7" + << "49\t\tDONE" + << "50\t\tSTORE_TR_STRING\t99\t3\t14\t14\t2" + << "51\t\tSTORE_TRID_STRING\t78\t7\t-1" + << "52\t\tSTORE_VAR\t\t79\t5\t\t\"color(1, 1, 1, 1)\"" + << "53\t\tSTORE_VAR_OBJECT\t80" + << "54\t\tSTORE_VAR_INTEGER\t81\t23" + << "55\t\tSTORE_VAR_DOUBLE\t82\t66.3" + << "56\t\tSTORE_VAR_BOOL\t\t83\ttrue" << "-------------------------------------------------------------------------------"; QQmlTestMessageHandler messageHandler; 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/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index fd35a5b873..852034cbde 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -1073,7 +1073,6 @@ void tst_qqmllanguage::bindTypeToJSValue() } { MyQmlObject *object = root->findChild<MyQmlObject *>("urlProperty"); QJSValue value = object->qjsvalue(); - QVERIFY(value.isString()); QUrl encoded; encoded.setEncodedUrl("main.qml?with%3cencoded%3edata", QUrl::TolerantMode); QCOMPARE(value.toString(), component.url().resolved(encoded).toString()); 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/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp index eec312ec4f..4d4eb93149 100644 --- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp +++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp @@ -460,7 +460,7 @@ void tst_qqmllistmodel::dynamic_data() QTest::newRow("set4a") << "{set(0,{'foo':456});count}" << 1 << "" << dr; QTest::newRow("set4c") << "{set(-1,{'foo':456})}" << 0 << "<Unknown File>: QML ListModel: set: index -1 out of range" << dr; QTest::newRow("set5a") << "{append({'foo':123,'bar':456});set(0,123);count}" << 1 << "<Unknown File>: QML ListModel: set: value is not an object" << dr; - QTest::newRow("set5b") << "{append({'foo':123,'bar':456});set(0,[1,2,3]);count}" << 1 << "<Unknown File>: QML ListModel: set: value is not an object" << dr; + QTest::newRow("set5b") << "{append({'foo':123,'bar':456});set(0,[1,2,3]);count}" << 1 << "" << dr; QTest::newRow("set6") << "{append({'foo':123});set(1,{'foo':456});count}" << 2 << "" << dr; QTest::newRow("setprop1") << "{append({'foo':123});setProperty(0,'foo',456);count}" << 1 << "" << dr; 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/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp b/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp index a0edfb6891..828aaeb1ea 100644 --- a/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp +++ b/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp @@ -269,7 +269,7 @@ void tst_qqmllistmodelworkerscript::dynamic_data() QTest::newRow("set4a") << "{set(0,{'foo':456});count}" << 1 << "" << dr; QTest::newRow("set4c") << "{set(-1,{'foo':456})}" << 0 << "<Unknown File>: QML ListModel: set: index -1 out of range" << dr; QTest::newRow("set5a") << "{append({'foo':123,'bar':456});set(0,123);count}" << 1 << "<Unknown File>: QML ListModel: set: value is not an object" << dr; - QTest::newRow("set5b") << "{append({'foo':123,'bar':456});set(0,[1,2,3]);count}" << 1 << "<Unknown File>: QML ListModel: set: value is not an object" << dr; + QTest::newRow("set5b") << "{append({'foo':123,'bar':456});set(0,[1,2,3]);count}" << 1 << "" << dr; QTest::newRow("set6") << "{append({'foo':123});set(1,{'foo':456});count}" << 2 << "" << dr; QTest::newRow("setprop1") << "{append({'foo':123});setProperty(0,'foo',456);count}" << 1 << "" << dr; diff --git a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp index 53e49a4b9e..8e3626ddf2 100644 --- a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp +++ b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp @@ -931,6 +931,7 @@ void tst_qqmllocale::dateFromLocaleString_data() void tst_qqmllocale::dateFromLocaleString() { + QSKIP("Needs fixes in our date time parser"); QFETCH(QString, locale); QFETCH(QString, format); @@ -963,18 +964,19 @@ void tst_qqmllocale::dateFromLocaleDateString_data() QTest::addColumn<QString>("format"); QTest::newRow("en_US 1") << "en_US" << "dddd, MMMM d, yyyy h:mm:ss AP"; - QTest::newRow("en_US long") << "en_US" << QLocale("en_US").dateTimeFormat(); - QTest::newRow("en_US short") << "en_US" << QLocale("en_US").dateTimeFormat(QLocale::ShortFormat); - QTest::newRow("de_DE long") << "de_DE" << QLocale("de_DE").dateTimeFormat(); - QTest::newRow("de_DE short") << "de_DE" << QLocale("de_DE").dateTimeFormat(QLocale::ShortFormat); - QTest::newRow("ar_SA long") << "ar_SA" << QLocale("ar_SA").dateTimeFormat(); - QTest::newRow("ar_SA short") << "ar_SA" << QLocale("ar_SA").dateTimeFormat(QLocale::ShortFormat); - QTest::newRow("zh_CN long") << "zh_CN" << QLocale("zh_CN").dateTimeFormat(); - QTest::newRow("zh_CN short") << "zh_CN" << QLocale("zh_CN").dateTimeFormat(QLocale::ShortFormat); + QTest::newRow("en_US long") << "en_US" << QLocale("en_US").dateFormat(); + QTest::newRow("en_US short") << "en_US" << QLocale("en_US").dateFormat(QLocale::ShortFormat); + QTest::newRow("de_DE long") << "de_DE" << QLocale("de_DE").dateFormat(); + QTest::newRow("de_DE short") << "de_DE" << QLocale("de_DE").dateFormat(QLocale::ShortFormat); + QTest::newRow("ar_SA long") << "ar_SA" << QLocale("ar_SA").dateFormat(); + QTest::newRow("ar_SA short") << "ar_SA" << QLocale("ar_SA").dateFormat(QLocale::ShortFormat); + QTest::newRow("zh_CN long") << "zh_CN" << QLocale("zh_CN").dateFormat(); + QTest::newRow("zh_CN short") << "zh_CN" << QLocale("zh_CN").dateFormat(QLocale::ShortFormat); } void tst_qqmllocale::dateFromLocaleDateString() { + QSKIP("Needs fixes in our date time parser"); QFETCH(QString, locale); QFETCH(QString, format); @@ -1007,18 +1009,19 @@ void tst_qqmllocale::dateFromLocaleTimeString_data() QTest::addColumn<QString>("format"); QTest::newRow("en_US 1") << "en_US" << "dddd, MMMM d, yyyy h:mm:ss AP"; - QTest::newRow("en_US long") << "en_US" << QLocale("en_US").dateTimeFormat(); - QTest::newRow("en_US short") << "en_US" << QLocale("en_US").dateTimeFormat(QLocale::ShortFormat); - QTest::newRow("de_DE long") << "de_DE" << QLocale("de_DE").dateTimeFormat(); - QTest::newRow("de_DE short") << "de_DE" << QLocale("de_DE").dateTimeFormat(QLocale::ShortFormat); - QTest::newRow("ar_SA long") << "ar_SA" << QLocale("ar_SA").dateTimeFormat(); - QTest::newRow("ar_SA short") << "ar_SA" << QLocale("ar_SA").dateTimeFormat(QLocale::ShortFormat); - QTest::newRow("zh_CN long") << "zh_CN" << QLocale("zh_CN").dateTimeFormat(); - QTest::newRow("zh_CN short") << "zh_CN" << QLocale("zh_CN").dateTimeFormat(QLocale::ShortFormat); + QTest::newRow("en_US long") << "en_US" << QLocale("en_US").timeFormat(); + QTest::newRow("en_US short") << "en_US" << QLocale("en_US").timeFormat(QLocale::ShortFormat); + QTest::newRow("de_DE long") << "de_DE" << QLocale("de_DE").timeFormat(); + QTest::newRow("de_DE short") << "de_DE" << QLocale("de_DE").timeFormat(QLocale::ShortFormat); + QTest::newRow("ar_SA long") << "ar_SA" << QLocale("ar_SA").timeFormat(); + QTest::newRow("ar_SA short") << "ar_SA" << QLocale("ar_SA").timeFormat(QLocale::ShortFormat); + QTest::newRow("zh_CN long") << "zh_CN" << QLocale("zh_CN").timeFormat(); + QTest::newRow("zh_CN short") << "zh_CN" << QLocale("zh_CN").timeFormat(QLocale::ShortFormat); } void tst_qqmllocale::dateFromLocaleTimeString() { + QSKIP("Needs fixes in our date time parser"); QFETCH(QString, locale); QFETCH(QString, format); 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/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp index b2f860455e..f4a7bcdb48 100644 --- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp @@ -535,7 +535,7 @@ void tst_qqmlmoduleplugin::importStrictModule_data() << "import com.nokia.InvalidFirstCommandModule 1.0\n" "MyPluginType {}" << QString() - << ":1:1: module identifier directive must be the first command in a qmldir file"; + << ":1:1: module identifier directive must be the first directive in a qmldir file"; } QTEST_MAIN(tst_qqmlmoduleplugin) diff --git a/tests/auto/qml/qqmlproperty/data/invalidBinding.qml b/tests/auto/qml/qqmlproperty/data/invalidBinding.qml index e2bb1d172d..9364cdaea7 100644 --- a/tests/auto/qml/qqmlproperty/data/invalidBinding.qml +++ b/tests/auto/qml/qqmlproperty/data/invalidBinding.qml @@ -4,7 +4,7 @@ Item { property Text text: myText property Rectangle rectangle1: myText - property Rectangle rectangle2: eval('getMyText()') // eval to force non-shared (v8) binding + property Rectangle rectangle2: getMyText() function getMyText() { return myText; } 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/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp index 9b83698591..418e2edf27 100644 --- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp +++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp @@ -151,7 +151,7 @@ void tst_qqmlproperty::qmlmetaproperty() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(obj, QObjectPrivate::get(obj)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(obj, QObjectPrivate::get(obj)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -367,7 +367,7 @@ void tst_qqmlproperty::qmlmetaproperty_object() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&object, QObjectPrivate::get(&object)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&object, QObjectPrivate::get(&object)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -415,7 +415,7 @@ void tst_qqmlproperty::qmlmetaproperty_object() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); static_cast<QQmlBinding *>(binding.data())->setTarget(prop); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QObjectPrivate::get(&dobject)->signalIndex("clicked()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QObjectPrivate::get(&dobject)->signalIndex("clicked()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -470,7 +470,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_string() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&object, QObjectPrivate::get(&object)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&object, QObjectPrivate::get(&object)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -518,7 +518,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_string() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); static_cast<QQmlBinding *>(binding.data())->setTarget(prop); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QObjectPrivate::get(&dobject)->signalIndex("clicked()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QObjectPrivate::get(&dobject)->signalIndex("clicked()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -568,7 +568,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_string() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); static_cast<QQmlBinding *>(binding.data())->setTarget(prop); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QQmlPropertyPrivate::get(prop)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QQmlPropertyPrivate::get(prop)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -617,7 +617,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_string() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); static_cast<QQmlBinding *>(binding.data())->setTarget(prop); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QQmlPropertyPrivate::get(prop)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QQmlPropertyPrivate::get(prop)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -671,7 +671,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_context() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&object, QObjectPrivate::get(&object)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&object, QObjectPrivate::get(&object)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -719,7 +719,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_context() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); static_cast<QQmlBinding *>(binding.data())->setTarget(prop); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QObjectPrivate::get(&dobject)->signalIndex("clicked()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QObjectPrivate::get(&dobject)->signalIndex("clicked()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -774,7 +774,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_string_context() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&object, QObjectPrivate::get(&object)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&object, QObjectPrivate::get(&object)->signalIndex("destroyed()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -822,7 +822,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_string_context() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); static_cast<QQmlBinding *>(binding.data())->setTarget(prop); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QObjectPrivate::get(&dobject)->signalIndex("clicked()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QObjectPrivate::get(&dobject)->signalIndex("clicked()"), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -872,7 +872,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_string_context() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); static_cast<QQmlBinding *>(binding.data())->setTarget(prop); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QQmlPropertyPrivate::get(prop)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QQmlPropertyPrivate::get(prop)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -921,7 +921,7 @@ void tst_qqmlproperty::qmlmetaproperty_object_string_context() QWeakPointer<QQmlAbstractBinding> binding(QQmlAbstractBinding::getPointer(new QQmlBinding(QLatin1String("null"), 0, engine.rootContext()))); static_cast<QQmlBinding *>(binding.data())->setTarget(prop); QVERIFY(binding != 0); - QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QQmlPropertyPrivate::get(prop)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1); + QQmlBoundSignalExpression *sigExpr = new QQmlBoundSignalExpression(&dobject, QQmlPropertyPrivate::get(prop)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1); QQmlAbstractExpression::DeleteWatcher sigExprWatcher(sigExpr); QVERIFY(sigExpr != 0 && !sigExprWatcher.wasDeleted()); @@ -1103,7 +1103,7 @@ void tst_qqmlproperty::read() QQmlProperty p(&o, "onClicked"); QCOMPARE(p.read(), QVariant()); - QVERIFY(0 == QQmlPropertyPrivate::takeSignalExpression(p, new QQmlBoundSignalExpression(&o, QQmlPropertyPrivate::get(p)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1))); + QVERIFY(0 == QQmlPropertyPrivate::takeSignalExpression(p, new QQmlBoundSignalExpression(&o, QQmlPropertyPrivate::get(p)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1))); QVERIFY(0 != QQmlPropertyPrivate::signalExpression(p)); QCOMPARE(p.read(), QVariant()); @@ -1115,7 +1115,7 @@ void tst_qqmlproperty::read() QQmlProperty p(&o, "onPropertyWithNotifyChanged"); QCOMPARE(p.read(), QVariant()); - QVERIFY(0 == QQmlPropertyPrivate::takeSignalExpression(p, new QQmlBoundSignalExpression(&o, QQmlPropertyPrivate::get(p)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1))); + QVERIFY(0 == QQmlPropertyPrivate::takeSignalExpression(p, new QQmlBoundSignalExpression(&o, QQmlPropertyPrivate::get(p)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1))); QVERIFY(0 != QQmlPropertyPrivate::signalExpression(p)); QCOMPARE(p.read(), QVariant()); @@ -1271,7 +1271,7 @@ void tst_qqmlproperty::write() QQmlProperty p(&o, "onClicked"); QCOMPARE(p.write(QVariant("console.log(1921)")), false); - QVERIFY(0 == QQmlPropertyPrivate::takeSignalExpression(p, new QQmlBoundSignalExpression(&o, QQmlPropertyPrivate::get(p)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1))); + QVERIFY(0 == QQmlPropertyPrivate::takeSignalExpression(p, new QQmlBoundSignalExpression(&o, QQmlPropertyPrivate::get(p)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1))); QVERIFY(0 != QQmlPropertyPrivate::signalExpression(p)); QCOMPARE(p.write(QVariant("console.log(1921)")), false); @@ -1285,7 +1285,7 @@ void tst_qqmlproperty::write() QQmlProperty p(&o, "onPropertyWithNotifyChanged"); QCOMPARE(p.write(QVariant("console.log(1921)")), false); - QVERIFY(0 == QQmlPropertyPrivate::takeSignalExpression(p, new QQmlBoundSignalExpression(&o, QQmlPropertyPrivate::get(p)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), false, QString(), -1, -1))); + QVERIFY(0 == QQmlPropertyPrivate::takeSignalExpression(p, new QQmlBoundSignalExpression(&o, QQmlPropertyPrivate::get(p)->signalIndex(), QQmlContextData::get(engine.rootContext()), 0, QLatin1String("null"), QString(), -1, -1))); QVERIFY(0 != QQmlPropertyPrivate::signalExpression(p)); QCOMPARE(p.write(QVariant("console.log(1921)")), false); @@ -1856,7 +1856,7 @@ void tst_qqmlproperty::warnOnInvalidBinding() QTest::ignoreMessage(QtWarningMsg, expectedWarning.toLatin1().constData()); // V8 error message for invalid binding to anchor - expectedWarning = testUrl.toString() + QString::fromLatin1(":14: Unable to assign QQuickItem_QML_6 to QQuickAnchorLine"); + expectedWarning = testUrl.toString() + QString::fromLatin1(":14:33: Unable to assign QQuickItem_QML_6 to QQuickAnchorLine"); QTest::ignoreMessage(QtWarningMsg, expectedWarning.toLatin1().constData()); QQmlComponent component(&engine, testUrl); 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/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp index a8e598b11c..7c0507dce3 100644 --- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp +++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp @@ -946,7 +946,7 @@ void tst_qqmlvaluetypes::bindingAssignment() // function assignment should fail without crashing { QString warning1 = testFileUrl("bindingAssignment.2.qml").toString() + QLatin1String(":6:13: Invalid use of Qt.binding() in a binding declaration."); - QString warning2 = testFileUrl("bindingAssignment.2.qml").toString() + QLatin1String(":10: Error: Cannot assign JavaScript function to value-type property"); + QString warning2 = testFileUrl("bindingAssignment.2.qml").toString() + QLatin1String(":10: Cannot assign JavaScript function to value-type property"); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); QQmlComponent component(&engine, testFileUrl("bindingAssignment.2.qml")); @@ -1050,7 +1050,7 @@ void tst_qqmlvaluetypes::autoBindingRemoval() { QQmlComponent component(&engine, testFileUrl("autoBindingRemoval.3.qml")); - QString warning = component.url().toString() + ":6: Unable to assign [undefined] to QRect"; + QString warning = component.url().toString() + ":6:11: Unable to assign [undefined] to QRect"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/instanceStateValues.qml b/tests/auto/qml/qqmlxmlhttprequest/data/instanceStateValues.qml index b3a54e9b53..8c027840a1 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/instanceStateValues.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/instanceStateValues.qml @@ -11,17 +11,17 @@ QtObject { // Attempt to overwrite and delete values var x = new XMLHttpRequest(); - x.UNSENT = 9; - x.OPENED = 9; - x.HEADERS_RECEIVED = 9; - x.LOADING = 9; - x.DONE = 9; + try { x.UNSENT = 9; } catch (e) {} + try { x.OPENED = 9; } catch (e) {} + try { x.HEADERS_RECEIVED = 9; } catch (e) {} + try { x.LOADING = 9; } catch (e) {} + try { x.DONE = 9; } catch (e) {} - delete x.UNSENT; - delete x.OPENED; - delete x.HEADERS_RECEIVED; - delete x.LOADING; - delete x.DONE; + try { delete x.UNSENT; } catch (e) {} + try { delete x.OPENED; } catch (e) {} + try { delete x.HEADERS_RECEIVED; } catch (e) {} + try { delete x.LOADING; } catch (e) {} + try { delete x.DONE; } catch (e) {} unsent = x.UNSENT opened = x.OPENED diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp index 9308bc6f40..cc55fd721c 100644 --- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp +++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp @@ -52,6 +52,21 @@ #include <qt_windows.h> #endif +static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000) +{ + QEventLoop loop; + QObject::connect(obj, signal, &loop, SLOT(quit())); + QTimer timer; + QSignalSpy timeoutSpy(&timer, SIGNAL(timeout())); + if (timeout > 0) { + QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit())); + timer.setSingleShot(true); + timer.start(timeout); + } + loop.exec(); + return timeoutSpy.isEmpty(); +} + // From qquickfolderlistmodel.h const int FileNameRole = Qt::UserRole+1; const int FilePathRole = Qt::UserRole+2; @@ -116,7 +131,8 @@ void tst_qquickfolderlistmodel::basicProperties() QVERIFY(flm != 0); flm->setProperty("folder", dataDirectoryUrl()); - QTRY_COMPARE(flm->property("count").toInt(),5); // wait for refresh + ::waitForSignal(flm, SIGNAL(folderChanged()), 0); + QCOMPARE(flm->property("count").toInt(), 5); QCOMPARE(flm->property("folder").toUrl(), dataDirectoryUrl()); QCOMPARE(flm->property("parentFolder").toUrl(), QUrl::fromLocalFile(QDir(directory()).canonicalPath())); QCOMPARE(flm->property("sortField").toInt(), int(Name)); 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/qquickworkerscript/tst_qquickworkerscript.cpp b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp index ed8fb9f56f..1530ce83e2 100644 --- a/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp +++ b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp @@ -235,6 +235,7 @@ void tst_QQuickWorkerScript::script_included() waitForEchoMessage(worker); const QMetaObject *mo = worker->metaObject(); + QEXPECT_FAIL("", "It is not possible to write to the global object right now", Continue); QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).toString(), value + " World"); qApp->processEvents(); @@ -257,7 +258,7 @@ void tst_QQuickWorkerScript::scriptError_onLoad() QVERIFY(worker != 0); QTRY_COMPARE(qquickworkerscript_lastWarning, - testFileUrl("script_error_onLoad.js").toString() + QLatin1String(":3: SyntaxError: Unexpected identifier")); + testFileUrl("script_error_onLoad.js").toString() + QLatin1String(":3:10: Expected token `,'")); qInstallMessageHandler(previousMsgHandler); qApp->processEvents(); 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/qv4debugger/qv4debugger.pro b/tests/auto/qml/qv4debugger/qv4debugger.pro new file mode 100644 index 0000000000..2a318955f3 --- /dev/null +++ b/tests/auto/qml/qv4debugger/qv4debugger.pro @@ -0,0 +1,7 @@ +CONFIG += testcase +TARGET = tst_qv4debugger +macx:CONFIG -= app_bundle + +SOURCES += tst_qv4debugger.cpp + +QT += core-private gui-private qml-private network testlib diff --git a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp new file mode 100644 index 0000000000..c6ecd1938a --- /dev/null +++ b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp @@ -0,0 +1,287 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include <QtTest/QtTest> + +#include <QJSEngine> +#include <private/qv4engine_p.h> +#include <private/qv4debugging_p.h> +#include <private/qv8engine_p.h> + +static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000) +{ + QEventLoop loop; + QObject::connect(obj, signal, &loop, SLOT(quit())); + QTimer timer; + QSignalSpy timeoutSpy(&timer, SIGNAL(timeout())); + if (timeout > 0) { + QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit())); + timer.setSingleShot(true); + timer.start(timeout); + } + loop.exec(); + return timeoutSpy.isEmpty(); +} + +class TestEngine : public QJSEngine +{ + Q_OBJECT +public: + TestEngine() + { + qMetaTypeId<InjectedFunction>(); + } + + Q_INVOKABLE void evaluate(const QString &script, const QString &fileName, int lineNumber = 1) + { + QJSEngine::evaluate(script, fileName, lineNumber); + emit evaluateFinished(); + } + + QV4::ExecutionEngine *v4Engine() { return QV8Engine::getV4(this); } + + typedef QV4::Value (*InjectedFunction)(QV4::SimpleCallContext*); + + Q_INVOKABLE void injectFunction(const QString &functionName, TestEngine::InjectedFunction injectedFunction) + { + QV4::ExecutionEngine *v4 = v4Engine(); + + QV4::String *name = v4->newString(functionName); + QV4::Value function = QV4::Value::fromObject(v4->newBuiltinFunction(v4->rootContext, name, injectedFunction)); + v4->globalObject->put(name, function); + } + +signals: + void evaluateFinished(); +}; + +Q_DECLARE_METATYPE(TestEngine::InjectedFunction) + +class TestAgent : public QV4::Debugging::DebuggerAgent +{ + Q_OBJECT +public: + TestAgent() + : m_wasPaused(false) + { + } + + virtual void debuggerPaused(QV4::Debugging::Debugger *debugger) + { + Q_ASSERT(m_debuggers.count() == 1 && m_debuggers.first() == debugger); + m_wasPaused = true; + m_statesWhenPaused << debugger->currentExecutionState(); + + foreach (const TestBreakPoint &bp, m_breakPointsToAddWhenPaused) + debugger->addBreakPoint(bp.fileName, bp.lineNumber); + m_breakPointsToAddWhenPaused.clear(); + + debugger->resume(); + } + + int debuggerCount() const { return m_debuggers.count(); } + + struct TestBreakPoint + { + TestBreakPoint() : lineNumber(-1) {} + TestBreakPoint(const QString &fileName, int lineNumber) + : fileName(fileName), lineNumber(lineNumber) {} + QString fileName; + int lineNumber; + }; + + bool m_wasPaused; + QList<QV4::Debugging::Debugger::ExecutionState> m_statesWhenPaused; + QList<TestBreakPoint> m_breakPointsToAddWhenPaused; +}; + +class tst_qv4debugger : public QObject +{ + Q_OBJECT +private slots: + void init(); + void cleanup(); + + void breakAnywhere(); + void pendingBreakpoint(); + void liveBreakPoint(); + void removePendingBreakPoint(); + void addBreakPointWhilePaused(); + void removeBreakPointForNextInstruction(); + +private: + void evaluateJavaScript(const QString &script, const QString &fileName, int lineNumber = 1) + { + QMetaObject::invokeMethod(m_engine, "evaluate", Qt::QueuedConnection, + Q_ARG(QString, script), Q_ARG(QString, fileName), + Q_ARG(int, lineNumber)); + waitForSignal(m_engine, SIGNAL(evaluateFinished()), /*timeout*/0); + } + + TestEngine *m_engine; + QV4::ExecutionEngine *m_v4; + TestAgent *m_debuggerAgent; + QThread *m_javaScriptThread; +}; + +void tst_qv4debugger::init() +{ + m_javaScriptThread = new QThread; + m_engine = new TestEngine; + m_v4 = m_engine->v4Engine(); + m_v4->enableDebugger(); + m_engine->moveToThread(m_javaScriptThread); + m_javaScriptThread->start(); + m_debuggerAgent = new TestAgent; + m_debuggerAgent->addDebugger(m_v4->debugger); +} + +void tst_qv4debugger::cleanup() +{ + m_javaScriptThread->exit(); + waitForSignal(m_javaScriptThread, SIGNAL(finished()), /*timeout*/ 0); + delete m_engine; + delete m_javaScriptThread; + m_engine = 0; + m_v4 = 0; + QCOMPARE(m_debuggerAgent->debuggerCount(), 0); + delete m_debuggerAgent; + m_debuggerAgent = 0; +} + +void tst_qv4debugger::breakAnywhere() +{ + QString script = + "var i = 42;\n" + "var j = i + 1\n" + "var k = i\n"; + m_debuggerAgent->pause(m_v4->debugger); + evaluateJavaScript(script, "testFile"); + QVERIFY(m_debuggerAgent->m_wasPaused); +} + +void tst_qv4debugger::pendingBreakpoint() +{ + QString script = + "var i = 42;\n" + "var j = i + 1\n" + "var k = i\n"; + m_debuggerAgent->addBreakPoint(m_v4->debugger, "testfile", 2); + evaluateJavaScript(script, "testfile"); + QVERIFY(m_debuggerAgent->m_wasPaused); + QCOMPARE(m_debuggerAgent->m_statesWhenPaused.count(), 1); + QV4::Debugging::Debugger::ExecutionState state = m_debuggerAgent->m_statesWhenPaused.first(); + QCOMPARE(state.fileName, QString("testfile")); + QCOMPARE(state.lineNumber, 2); +} + +void tst_qv4debugger::liveBreakPoint() +{ + QString script = + "var i = 42;\n" + "var j = i + 1\n" + "var k = i\n"; + m_debuggerAgent->m_breakPointsToAddWhenPaused << TestAgent::TestBreakPoint("liveBreakPoint", 3); + m_debuggerAgent->pause(m_v4->debugger); + evaluateJavaScript(script, "liveBreakPoint"); + QVERIFY(m_debuggerAgent->m_wasPaused); + QCOMPARE(m_debuggerAgent->m_statesWhenPaused.count(), 2); + QV4::Debugging::Debugger::ExecutionState state = m_debuggerAgent->m_statesWhenPaused.at(1); + QCOMPARE(state.fileName, QString("liveBreakPoint")); + QCOMPARE(state.lineNumber, 3); +} + +void tst_qv4debugger::removePendingBreakPoint() +{ + QString script = + "var i = 42;\n" + "var j = i + 1\n" + "var k = i\n"; + m_debuggerAgent->addBreakPoint(m_v4->debugger, "removePendingBreakPoint", 2); + m_debuggerAgent->removeBreakPoint(m_v4->debugger, "removePendingBreakPoint", 2); + evaluateJavaScript(script, "removePendingBreakPoint"); + QVERIFY(!m_debuggerAgent->m_wasPaused); +} + +void tst_qv4debugger::addBreakPointWhilePaused() +{ + QString script = + "var i = 42;\n" + "var j = i + 1\n" + "var k = i\n"; + m_debuggerAgent->addBreakPoint(m_v4->debugger, "addBreakPointWhilePaused", 1); + m_debuggerAgent->m_breakPointsToAddWhenPaused << TestAgent::TestBreakPoint("addBreakPointWhilePaused", 2); + evaluateJavaScript(script, "addBreakPointWhilePaused"); + QVERIFY(m_debuggerAgent->m_wasPaused); + QCOMPARE(m_debuggerAgent->m_statesWhenPaused.count(), 2); + + QV4::Debugging::Debugger::ExecutionState state = m_debuggerAgent->m_statesWhenPaused.at(0); + QCOMPARE(state.fileName, QString("addBreakPointWhilePaused")); + QCOMPARE(state.lineNumber, 1); + + state = m_debuggerAgent->m_statesWhenPaused.at(1); + QCOMPARE(state.fileName, QString("addBreakPointWhilePaused")); + QCOMPARE(state.lineNumber, 2); +} + +static QV4::Value someCall(QV4::SimpleCallContext *ctx) +{ + ctx->engine->debugger->removeBreakPoint("removeBreakPointForNextInstruction", 2); + return QV4::Value::undefinedValue(); +} + +void tst_qv4debugger::removeBreakPointForNextInstruction() +{ + QString script = + "someCall();\n" + "var i = 42;"; + + QMetaObject::invokeMethod(m_engine, "injectFunction", Qt::BlockingQueuedConnection, + Q_ARG(QString, "someCall"), Q_ARG(TestEngine::InjectedFunction, someCall)); + + m_debuggerAgent->addBreakPoint(m_v4->debugger, "removeBreakPointForNextInstruction", 2); + + evaluateJavaScript(script, "removeBreakPointForNextInstruction"); + QVERIFY(!m_debuggerAgent->m_wasPaused); +} + +QTEST_MAIN(tst_qv4debugger) + +#include "tst_qv4debugger.moc" diff --git a/tests/auto/qml/v4/data/colorType.qml b/tests/auto/qml/v4/data/colorType.qml deleted file mode 100644 index f6a98a4a3e..0000000000 --- a/tests/auto/qml/v4/data/colorType.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool useMyColor: true - property color myColor: "red" - property color myOtherColor: "green" - - property color test1: useMyColor ? myColor : myOtherColor - property color test2: useMyColor ? "red" : "green" - property color test3: useMyColor ? myColor : "green" - - property bool test4: !myColor ? false : true - - property bool test5: myColor != "red" - property bool test6: myColor == "#ff0000" - property bool test7: myColor != "#00ff00" -} - diff --git a/tests/auto/qml/v4/data/conditionalExpr.qml b/tests/auto/qml/v4/data/conditionalExpr.qml deleted file mode 100644 index 704f7c6c5a..0000000000 --- a/tests/auto/qml/v4/data/conditionalExpr.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Qt.v4 1.0 - -Result { - property int n: 2 - property int a: n ? 1 : 0 - property int b: if (n) { 1 } else { 0 } - result: (a && b) ? 0 : 1 -} diff --git a/tests/auto/qml/v4/data/conversions.1.qml b/tests/auto/qml/v4/data/conversions.1.qml deleted file mode 100644 index b3abde770a..0000000000 --- a/tests/auto/qml/v4/data/conversions.1.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.v4 1.0 - -Conversion { - // test assigning bool prop to other proptypes. - boolProp: true - intProp: boolProp - floatProp: boolProp - doubleProp: boolProp - qrealProp: boolProp - qstringProp: boolProp - qurlProp: boolProp - vec3Prop: Qt.vector3d(boolProp, boolProp, boolProp) -} diff --git a/tests/auto/qml/v4/data/conversions.2.qml b/tests/auto/qml/v4/data/conversions.2.qml deleted file mode 100644 index 2fd0453ac2..0000000000 --- a/tests/auto/qml/v4/data/conversions.2.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.v4 1.0 - -Conversion { - // test assigning int prop to other proptypes. - boolProp: intProp - intProp: 4 - floatProp: intProp - doubleProp: intProp - qrealProp: intProp - qstringProp: intProp - qurlProp: intProp - vec3Prop: Qt.vector3d(intProp, intProp, intProp) -} diff --git a/tests/auto/qml/v4/data/conversions.3.qml b/tests/auto/qml/v4/data/conversions.3.qml deleted file mode 100644 index 66f0761a25..0000000000 --- a/tests/auto/qml/v4/data/conversions.3.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.v4 1.0 - -Conversion { - // test assigning float prop to other proptypes. - boolProp: floatProp - intProp: floatProp - floatProp: 4.4 - doubleProp: floatProp - qrealProp: floatProp - qstringProp: floatProp - qurlProp: floatProp - vec3Prop: Qt.vector3d(floatProp, floatProp, floatProp) -} diff --git a/tests/auto/qml/v4/data/conversions.4.qml b/tests/auto/qml/v4/data/conversions.4.qml deleted file mode 100644 index ccf0035313..0000000000 --- a/tests/auto/qml/v4/data/conversions.4.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.v4 1.0 - -Conversion { - // test assigning double prop to other prop types - boolProp: doubleProp - intProp: doubleProp - floatProp: doubleProp - doubleProp: 4.444444444 - qrealProp: doubleProp - qstringProp: doubleProp - qurlProp: doubleProp - vec3Prop: Qt.vector3d(doubleProp, doubleProp, doubleProp) -} diff --git a/tests/auto/qml/v4/data/conversions.5.qml b/tests/auto/qml/v4/data/conversions.5.qml deleted file mode 100644 index 26dc3b7195..0000000000 --- a/tests/auto/qml/v4/data/conversions.5.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.v4 1.0 - -Conversion { - // test assigning qreal prop to other prop types - boolProp: qrealProp - intProp: qrealProp - floatProp: qrealProp - doubleProp: qrealProp - qrealProp: 4.44 - qstringProp: qrealProp - qurlProp: qrealProp - vec3Prop: Qt.vector3d(qrealProp, qrealProp, qrealProp) -} diff --git a/tests/auto/qml/v4/data/conversions.6.qml b/tests/auto/qml/v4/data/conversions.6.qml deleted file mode 100644 index 573b227ada..0000000000 --- a/tests/auto/qml/v4/data/conversions.6.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.v4 1.0 - -Conversion { - // test assigning string prop to other proptypes. - boolProp: qstringProp - intProp: qstringProp - floatProp: qstringProp - doubleProp: qstringProp - qrealProp: qstringProp - qstringProp: "4" - qurlProp: qstringProp - vec3Prop: Qt.vector3d(qstringProp, qstringProp, qstringProp) -} diff --git a/tests/auto/qml/v4/data/conversions.7.qml b/tests/auto/qml/v4/data/conversions.7.qml deleted file mode 100644 index 5112b06b1e..0000000000 --- a/tests/auto/qml/v4/data/conversions.7.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.v4 1.0 - -Conversion { - // test assigning url prop to other proptypes. - boolProp: qurlProp - intProp: qurlProp - floatProp: qurlProp - doubleProp: qurlProp - qrealProp: qurlProp - qstringProp: qurlProp - qurlProp: "4" - vec3Prop: Qt.vector3d(qurlProp, qurlProp, qurlProp) -} diff --git a/tests/auto/qml/v4/data/conversions.8.qml b/tests/auto/qml/v4/data/conversions.8.qml deleted file mode 100644 index 18bf160e7e..0000000000 --- a/tests/auto/qml/v4/data/conversions.8.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.v4 1.0 - -Conversion { - // test assigning vector prop to other proptypes. - boolProp: vec3Prop - intProp: vec3Prop - floatProp: vec3Prop - doubleProp: vec3Prop - qrealProp: vec3Prop - qstringProp: vec3Prop - qurlProp: vec3Prop - vec3Prop: Qt.vector3d(4, 4, 4) -} diff --git a/tests/auto/qml/v4/data/doubleBoolJump.qml b/tests/auto/qml/v4/data/doubleBoolJump.qml deleted file mode 100644 index 2eea73b573..0000000000 --- a/tests/auto/qml/v4/data/doubleBoolJump.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - QtObject { - property real output: i1.p1 || i2.p2 == "text" ? 0.7 : 0 - } - - QtObject { - id: i2 - property string p2 - } - - QtObject { - id: i1 - property bool p1: false - } -} - diff --git a/tests/auto/qml/v4/data/equals.qml b/tests/auto/qml/v4/data/equals.qml deleted file mode 100644 index 2862bb7ac9..0000000000 --- a/tests/auto/qml/v4/data/equals.qml +++ /dev/null @@ -1,51 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property QtObject myprop1: null - property QtObject myprop2: QtObject {} - property real zero: 0 - property bool falseProp: false - - property bool test1: myprop1 == false - property bool test2: myprop1 == null - property bool test3: 5 == myprop1 - property bool test4: null == myprop1 - property bool test5: myprop1 != false - property bool test6: myprop1 != null - property bool test7: 5 != myprop1 - property bool test8: null != myprop1 - - property bool test9: myprop2 == false - property bool test10: myprop2 == null - property bool test11: 5 == myprop2 - property bool test12: null == myprop2 - property bool test13: myprop2 != false - property bool test14: myprop2 != null - property bool test15: 5 != myprop2 - property bool test16: null != myprop2 - - property bool test17: myprop1 == myprop1 - property bool test18: myprop1 != myprop1 - property bool test19: myprop1 == myprop2 - property bool test20: myprop1 != myprop2 - property bool test21: myprop2 == myprop2 - property bool test22: myprop2 != myprop2 - - property bool test23: myprop1 == "hello" - property bool test24: myprop1 != "hello" - property bool test25: myprop2 == "hello" - property bool test26: myprop2 != "hello" - - property bool test27: falseProp == zero - property bool test28: falseProp != zero - property bool test29: falseProp == 1 - property bool test30: falseProp != 1 - property bool test31: true == zero - property bool test32: true != zero - property bool test33: true == 1 - property bool test34: true != 1 - - property bool test35: "a\ -b" === "ab" -} - diff --git a/tests/auto/qml/v4/data/fetchException.qml b/tests/auto/qml/v4/data/fetchException.qml deleted file mode 100644 index 6431fcfae8..0000000000 --- a/tests/auto/qml/v4/data/fetchException.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -Item { - property Item data - property int a: data.x, 1 -} diff --git a/tests/auto/qml/v4/data/integerOperations.qml b/tests/auto/qml/v4/data/integerOperations.qml deleted file mode 100644 index 805f4566fb..0000000000 --- a/tests/auto/qml/v4/data/integerOperations.qml +++ /dev/null @@ -1,59 +0,0 @@ -import QtQuick 2.0 - -Item { - property int testa1: i1.p1 - property int testa2: -testa1 - i1.p1 - - property int testb1: i1.p1 & 2 - property int testb2: i1.p2 & 2 - property int testb3: 2 & i1.p1 - property int testb4: 2 & i1.p2 - property int testb5: i1.p1 & i1.p3 - property int testb6: i1.p2 & i1.p3 - property int testb7: i1.p3 & i1.p1 - property int testb8: i1.p3 & i1.p2 - - property int testc1: i1.p1 | 2 - property int testc2: i1.p2 | 2 - property int testc3: 2 | i1.p1 - property int testc4: 2 | i1.p2 - property int testc5: i1.p1 | i1.p3 - property int testc6: i1.p2 | i1.p3 - property int testc7: i1.p3 | i1.p1 - property int testc8: i1.p3 | i1.p2 - - property int testd1: i1.p1 ^ 7 - property int testd2: 7 ^ i1.p1 - property int testd3: i1.p1 ^ i1.p4 - property int testd4: i1.p4 ^ i1.p1 - - property int teste1: i1.p4 << 2 - property int teste2: i1.p5 << 2 - property int teste3: 2 << i1.p4 - property int teste4: i1.p4 << i1.p3 - property int teste5: i1.p5 << i1.p3 - property int teste6: i1.p3 << i1.p4 - - property int testf1: i1.p4 >> 2 - property int testf2: i1.p5 >> 2 - property int testf3: 2 >> i1.p4 - property int testf4: i1.p4 >> i1.p3 - property int testf5: i1.p5 >> i1.p3 - property int testf6: i1.p3 >> i1.p4 - - property int testg1: i1.p4 >>> 2 - property int testg2: i1.p5 >>> 2 - property int testg3: 2 >>> i1.p4 - property int testg4: i1.p4 >>> i1.p3 - property int testg5: i1.p5 >>> i1.p3 - property int testg6: i1.p3 >>> i1.p4 - - QtObject { - id: i1 - property int p1: 333 - property int p2: -666 - property int p3: 2 - property int p4: 7 - property int p5: -7 - } - } diff --git a/tests/auto/qml/v4/data/jsvalueHandling.qml b/tests/auto/qml/v4/data/jsvalueHandling.qml deleted file mode 100644 index d15e878a52..0000000000 --- a/tests/auto/qml/v4/data/jsvalueHandling.qml +++ /dev/null @@ -1,69 +0,0 @@ -import QtQuick 2.0 -import Qt.v4 1.0 - -JSValueTest { - property bool pBool: true - property int pInt: 666 - property real pReal: 3.1415927 - property string pString: 'foo' - property url pUrl: 'http://tools.ietf.org/html/rfc3986#section-1.1.2' - property color pColor: Qt.rgba(1, 0, 0, 0.5) - property QtObject pObject: QtObject { property string foo: 'bar' } - property var pVar: pUrl - - // Test assignment to QJSValue - boolVar: pBool - intVar: pInt - realVar: pReal - stringVar: pString - urlVar: pUrl - colorVar: pColor - objectVar: pObject - nullVar: null - varVar: pVar - - // Test equivalence - property bool boolConversionSuccess: (boolVar == true) - property bool intConversionSuccess: (intVar == 666) - property bool realConversionSuccess: (realVar == 3.1415927) - property bool stringConversionSuccess: (stringVar == 'foo') - - property url comparisonUrl: 'http://tools.ietf.org/html/rfc3986#section-1.1.2' - property bool urlConversionSuccess: (urlVar == comparisonUrl) - - property color comparisonColor: Qt.rgba(1, 0, 0, 0.5) - property bool colorConversionSuccess: (colorVar == comparisonColor) - - property bool objectConversionSuccess: (objectVar == pObject) - property bool nullConversionSuccess: (nullVar == null) - - property bool varConversionSuccess: (varVar == comparisonUrl) - - // Operations are not handled by V4 - they should pass through correctly - property var pVarNot: !boolVar - property var pVarComplement: ~intVar - property var pVarEqual: (boolVar == pBool) - property var pVarLiteralEqual: (boolVar == true) - property var pVarUnequal: (urlVar == colorVar) - property var pVarComparison: (intVar <= intVar) - property var pVarShift: (intVar >> 1) - - Component.onCompleted: { - if (!boolConversionSuccess) console.warn('QV4: bool conversion failed'); - if (!intConversionSuccess) console.warn('QV4: int conversion failed'); - if (!realConversionSuccess) console.warn('QV4: real conversion failed'); - if (!stringConversionSuccess) console.warn('QV4: string conversion failed'); - if (!urlConversionSuccess) console.warn('QV4: url conversion failed'); - if (!colorConversionSuccess) console.warn('QV4: color conversion failed'); - if (!objectConversionSuccess) console.warn('QV4: object conversion failed'); - if (!nullConversionSuccess) console.warn('QV4: null conversion failed'); - if (!varConversionSuccess) console.warn('QV4: var conversion failed'); - if (pVarNot != false) console.warn('QV4: var negation impeded'); - if (pVarComplement != ~666) console.warn('QV4: var complement impeded'); - if (pVarEqual != true) console.warn('QV4: var equality impeded'); - if (pVarLiteralEqual != true) console.warn('QV4: var/literal equality impeded'); - if (pVarUnequal != false) console.warn('QV4: var unequality impeded'); - if (pVarComparison != true) console.warn('QV4: var comparison impeded'); - if (pVarShift != 333) console.warn('QV4: var shift impeded'); - } -} diff --git a/tests/auto/qml/v4/data/logicalAnd.2.qml b/tests/auto/qml/v4/data/logicalAnd.2.qml deleted file mode 100644 index cc3d75bd90..0000000000 --- a/tests/auto/qml/v4/data/logicalAnd.2.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.v4 1.0 - -Result { - property string s: "foo" && "bar" - result: s == "bar" -} diff --git a/tests/auto/qml/v4/data/logicalAnd.3.qml b/tests/auto/qml/v4/data/logicalAnd.3.qml deleted file mode 100644 index 6527f05d07..0000000000 --- a/tests/auto/qml/v4/data/logicalAnd.3.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Qt.v4 1.0 - -Result { - property string s: "" - property bool flag: true - - result: (s && flag) == "" -} diff --git a/tests/auto/qml/v4/data/logicalAnd.4.qml b/tests/auto/qml/v4/data/logicalAnd.4.qml deleted file mode 100644 index fbcee91699..0000000000 --- a/tests/auto/qml/v4/data/logicalAnd.4.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Qt.v4 1.0 - -Result { - property string s: "foo" - property bool flag: true - - result: (!flag && s) == false -} diff --git a/tests/auto/qml/v4/data/logicalAnd.5.qml b/tests/auto/qml/v4/data/logicalAnd.5.qml deleted file mode 100644 index f0698463fe..0000000000 --- a/tests/auto/qml/v4/data/logicalAnd.5.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.v4 1.0 - -Result { - property bool flag: true - - result: (null && flag) == null -} diff --git a/tests/auto/qml/v4/data/logicalAnd.6.qml b/tests/auto/qml/v4/data/logicalAnd.6.qml deleted file mode 100644 index e98b5c99cd..0000000000 --- a/tests/auto/qml/v4/data/logicalAnd.6.qml +++ /dev/null @@ -1,9 +0,0 @@ -import Qt.v4 1.0 - -Result { - property string s: "" - property bool flag: true - property string subresult: s && flag - - result: subresult === "" -} diff --git a/tests/auto/qml/v4/data/logicalAnd.7.qml b/tests/auto/qml/v4/data/logicalAnd.7.qml deleted file mode 100644 index 0f19d3fb40..0000000000 --- a/tests/auto/qml/v4/data/logicalAnd.7.qml +++ /dev/null @@ -1,9 +0,0 @@ -import Qt.v4 1.0 - -Result { - property real nan: Number.NaN - property bool flag: true - property real subresult: nan && flag - - result: isNaN(subresult) -} diff --git a/tests/auto/qml/v4/data/logicalAnd.qml b/tests/auto/qml/v4/data/logicalAnd.qml deleted file mode 100644 index 40fc3616c2..0000000000 --- a/tests/auto/qml/v4/data/logicalAnd.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.v4 1.0 - -Result { - property int a: 10 - result: a == 10 && a == 2 -} diff --git a/tests/auto/qml/v4/data/logicalOr.2.qml b/tests/auto/qml/v4/data/logicalOr.2.qml deleted file mode 100644 index 54fb78b127..0000000000 --- a/tests/auto/qml/v4/data/logicalOr.2.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.v4 1.0 - -Result { - property string s: "foo" || "bar" - result: s == "foo" -} diff --git a/tests/auto/qml/v4/data/logicalOr.qml b/tests/auto/qml/v4/data/logicalOr.qml deleted file mode 100644 index 406a7d83eb..0000000000 --- a/tests/auto/qml/v4/data/logicalOr.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.v4 1.0 - -Result { - property int a: 10 - result: a == 1 || a == 2 -} diff --git a/tests/auto/qml/v4/data/mathAbs.qml b/tests/auto/qml/v4/data/mathAbs.qml deleted file mode 100644 index eb504ae4d8..0000000000 --- a/tests/auto/qml/v4/data/mathAbs.qml +++ /dev/null @@ -1,42 +0,0 @@ -import QtQuick 2.0 - -Item { - property real test1: Math.abs(i1.p1) - property real test2: Math.abs(i1.p2) - - property int test3: Math.abs(i1.p3) - property int test4: Math.abs(i1.p4) - - property real subtest5: Math.abs() - property real subtest6: Math.abs(i1.p6) - property bool test5: isNaN(subtest5) - property bool test6: isNaN(subtest6) - - property real subtest7: Math.abs(i1.p7) - property bool test7: isNaN(subtest7) - property int test8: Math.abs(i1.p8) - - property real subtest9: Math.abs(i1.p9) - property real subtest10: Math.abs(i1.p10) - property bool test9: subtest9 === Number.POSITIVE_INFINITY - property bool test10: subtest10 === Number.POSITIVE_INFINITY - - property int test11: Math.abs(i1.p11) - property real subtest12: Math.abs(i1.p12) - property bool test12: subtest12 === 0 && (1/subtest12) === Infinity - - QtObject { - id: i1 - property real p1: -3.7 - property real p2: 4.5 - property int p3: 18 - property int p4: -72 - property real p6: Number.NaN - property string p7: "hello world" - property string p8: "82" - property real p9: Number.NEGATIVE_INFINITY - property real p10: Number.POSITIVE_INFINITY - property real p11: 0 - property real p12: -0 - } - } diff --git a/tests/auto/qml/v4/data/mathCeil.qml b/tests/auto/qml/v4/data/mathCeil.qml deleted file mode 100644 index 1f65066233..0000000000 --- a/tests/auto/qml/v4/data/mathCeil.qml +++ /dev/null @@ -1,41 +0,0 @@ -import QtQuick 2.0 - -Item { - property real test1: Math.ceil(i1.p1) - property real test2: Math.ceil(i1.p2) - - property real subtest3: Math.ceil() - property real subtest4: Math.ceil(i1.p4) - property bool test3: isNaN(subtest3) - property bool test4: isNaN(subtest4) - - property real subtest5: Math.ceil(i1.p5) - property bool test5: isNaN(subtest5) - property real test6: Math.ceil(i1.p6) - - property real subtest7: Math.ceil(i1.p7) - property real subtest8: Math.ceil(i1.p8) - property bool test7: subtest7 === Number.NEGATIVE_INFINITY - property bool test8: subtest8 === Number.POSITIVE_INFINITY - - property real test9: Math.ceil(i1.p9) - property real subtest10: Math.ceil(i1.p10) - property bool test10: subtest10 === 0 && (1/subtest10) === -Infinity - - property real subtest11: Math.ceil(i1.p11) - property bool test11: subtest11 === 0 && (1/subtest11) === -Infinity - - QtObject { - id: i1 - property real p1: -3.7 - property real p2: 4.4 - property real p4: Number.NaN - property string p5: "hello world" - property string p6: "82.6" - property real p7: Number.NEGATIVE_INFINITY - property real p8: Number.POSITIVE_INFINITY - property real p9: 0 - property real p10: -0 - property real p11: -0.5 - } - } diff --git a/tests/auto/qml/v4/data/mathCos.qml b/tests/auto/qml/v4/data/mathCos.qml deleted file mode 100644 index 44c47e9f15..0000000000 --- a/tests/auto/qml/v4/data/mathCos.qml +++ /dev/null @@ -1,41 +0,0 @@ -import QtQuick 2.0 - -Item { - property real test1: Math.cos(i1.p1) - property real test2: Math.cos(i1.p2) - - property real subtest3: Math.cos() - property real subtest4: Math.cos(i1.p4) - property bool test3: isNaN(subtest3) - property bool test4: isNaN(subtest4) - - property real subtest5: Math.cos(i1.p5) - property bool test5: isNaN(subtest5) - property real test6: Math.cos(i1.p6) - - property real subtest7: Math.cos(i1.p7) - property real subtest8: Math.cos(i1.p8) - property bool test7: isNaN(subtest7) - property bool test8: isNaN(subtest8) - - property real subtest9: Math.cos(i1.p9) - property bool test9: subtest9 === 1 - property real subtest10: Math.cos(i1.p10) - property bool test10: subtest10 === 1 - - property real subtest11: Math.PI / 6.66 - property real test11: Math.cos(subtest11) - - QtObject { - id: i1 - property real p1: -3.7 - property real p2: 4.4 - property real p4: Number.NaN - property string p5: "hello world" - property string p6: "82.6" - property real p7: Number.NEGATIVE_INFINITY - property real p8: Number.POSITIVE_INFINITY - property real p9: 0 - property real p10: -0 - } - } diff --git a/tests/auto/qml/v4/data/mathFloor.qml b/tests/auto/qml/v4/data/mathFloor.qml deleted file mode 100644 index 3473dccd10..0000000000 --- a/tests/auto/qml/v4/data/mathFloor.qml +++ /dev/null @@ -1,37 +0,0 @@ -import QtQuick 2.0 - -Item { - property real test1: Math.floor(i1.p1) - property real test2: Math.floor(i1.p2) - - property real subtest3: Math.floor() - property real subtest4: Math.floor(i1.p4) - property bool test3: isNaN(subtest3) - property bool test4: isNaN(subtest4) - - property real subtest5: Math.floor(i1.p5) - property bool test5: isNaN(subtest5) - property real test6: Math.floor(i1.p6) - - property real subtest7: Math.floor(i1.p7) - property real subtest8: Math.floor(i1.p8) - property bool test7: subtest7 === Number.NEGATIVE_INFINITY - property bool test8: subtest8 === Number.POSITIVE_INFINITY - - property real test9: Math.floor(i1.p9) - property real subtest10: Math.floor(i1.p10) - property bool test10: subtest10 === 0 && (1/subtest10) === -Infinity - - QtObject { - id: i1 - property real p1: -3.7 - property real p2: 4.4 - property real p4: Number.NaN - property string p5: "hello world" - property string p6: "82.6" - property real p7: Number.NEGATIVE_INFINITY - property real p8: Number.POSITIVE_INFINITY - property real p9: 0 - property real p10: -0 - } - } diff --git a/tests/auto/qml/v4/data/mathMax.qml b/tests/auto/qml/v4/data/mathMax.qml deleted file mode 100644 index cd8a88a3e7..0000000000 --- a/tests/auto/qml/v4/data/mathMax.qml +++ /dev/null @@ -1,45 +0,0 @@ -import QtQuick 2.0 - -Item { - property real test1: Math.max(i1.p1, i1.p2) - property real test2: Math.max(i1.p2, i1.p3) - - property real subtest3: Math.max() - property real subtest4: Math.max(i1.p4) - property bool test3: subtest3 === -Infinity - property bool test4: isNaN(subtest4) - - property real subtest5: Math.max(i1.p5, i1.p1) - property bool test5: isNaN(subtest5) - property real test6: Math.max(i1.p6, i1.p3) - - property real test7: Math.max(i1.p7, i1.p2) - property real subtest8: Math.max(i1.p8, i1.p2) - property bool test8: subtest8 === Number.POSITIVE_INFINITY - - property real subtest9: Math.max(i1.p10, i1.p9) - property bool test9: subtest9 === 0 && (1/subtest9) === Infinity - - // Reverse the inputs to Math.max - property real subtest10: Math.max(i1.p9, i1.p10) - property bool test10: subtest10 === 0 && (1/subtest10) === Infinity - - property real test11: Math.max(i1.p11, i1.p1) - property real test12: Math.max(i1.p11, i1.p2) - property real test13: Math.max(i1.p1, i1.p2, i1.p3) - - QtObject { - id: i1 - property real p1: -3.7 - property real p2: 4.4 - property int p3: 7 - property real p4: Number.NaN - property string p5: "hello world" - property string p6: "82.6" - property real p7: Number.NEGATIVE_INFINITY - property real p8: Number.POSITIVE_INFINITY - property real p9: 0 - property real p10: -0 - property var p11: null - } -} diff --git a/tests/auto/qml/v4/data/mathMin.qml b/tests/auto/qml/v4/data/mathMin.qml deleted file mode 100644 index 4ae5408b58..0000000000 --- a/tests/auto/qml/v4/data/mathMin.qml +++ /dev/null @@ -1,45 +0,0 @@ -import QtQuick 2.0 - -Item { - property real test1: Math.min(i1.p1, i1.p2) - property real test2: Math.min(i1.p2, i1.p3) - - property real subtest3: Math.min() - property real subtest4: Math.min(i1.p4) - property bool test3: subtest3 === Infinity - property bool test4: isNaN(subtest4) - - property real subtest5: Math.min(i1.p5, i1.p1) - property bool test5: isNaN(subtest5) - property real test6: Math.min(i1.p6, i1.p3) - - property real subtest7: Math.min(i1.p7, i1.p2) - property bool test7: subtest7 === Number.NEGATIVE_INFINITY - property real test8: Math.min(i1.p8, i1.p2) - - property real subtest9: Math.min(i1.p10, i1.p9) - property bool test9: subtest9 === 0 && (1/subtest9) === -Infinity - - // Reverse the inputs to Math.min - property real subtest10: Math.min(i1.p9, i1.p10) - property bool test10: subtest10 === 0 && (1/subtest10) === -Infinity - - property real test11: Math.min(i1.p11, i1.p1) - property real test12: Math.min(i1.p11, i1.p2) - property real test13: Math.min(i1.p1, i1.p2, i1.p3) - - QtObject { - id: i1 - property real p1: -3.7 - property real p2: 4.4 - property int p3: 95 - property real p4: Number.NaN - property string p5: "hello world" - property string p6: "82.6" - property real p7: Number.NEGATIVE_INFINITY - property real p8: Number.POSITIVE_INFINITY - property real p9: 0 - property real p10: -0 - property var p11: null - } - } diff --git a/tests/auto/qml/v4/data/mathSin.qml b/tests/auto/qml/v4/data/mathSin.qml deleted file mode 100644 index c48ec03fee..0000000000 --- a/tests/auto/qml/v4/data/mathSin.qml +++ /dev/null @@ -1,41 +0,0 @@ -import QtQuick 2.0 - -Item { - property real test1: Math.sin(i1.p1) - property real test2: Math.sin(i1.p2) - - property real subtest3: Math.sin() - property real subtest4: Math.sin(i1.p4) - property bool test3: isNaN(subtest3) - property bool test4: isNaN(subtest4) - - property real subtest5: Math.sin(i1.p5) - property bool test5: isNaN(subtest5) - property real test6: Math.sin(i1.p6) - - property real subtest7: Math.sin(i1.p7) - property real subtest8: Math.sin(i1.p8) - property bool test7: isNaN(subtest7) - property bool test8: isNaN(subtest8) - - property real subtest9: Math.sin(i1.p9) - property bool test9: subtest9 === 0 && (1/subtest9) === Infinity - property real subtest10: Math.sin(i1.p10) - property bool test10: subtest10 === 0 && (1/subtest10) === -Infinity - - property real subtest11: Math.PI / 6.66 - property real test11: Math.sin(subtest11) - - QtObject { - id: i1 - property real p1: -3.7 - property real p2: 4.4 - property real p4: Number.NaN - property string p5: "hello world" - property string p6: "82.6" - property real p7: Number.NEGATIVE_INFINITY - property real p8: Number.POSITIVE_INFINITY - property real p9: 0 - property real p10: -0 - } - } diff --git a/tests/auto/qml/v4/data/nestedLogicalAnd.qml b/tests/auto/qml/v4/data/nestedLogicalAnd.qml deleted file mode 100644 index 1358fcea64..0000000000 --- a/tests/auto/qml/v4/data/nestedLogicalAnd.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.v4 1.0 - -Result { - property bool val1: false - property bool val2: true - property bool val3: false - - property bool b1: (true && true && false) - property bool b2: (true && (false && true)) - property bool b3: ((true && true) && true) - property bool b4: (val1 && (val2 && val3)) ? true : false - - result: !b1 && !b2 && b3 && !b4 -} diff --git a/tests/auto/qml/v4/data/nestedLogicalOr.qml b/tests/auto/qml/v4/data/nestedLogicalOr.qml deleted file mode 100644 index c4478a3e7b..0000000000 --- a/tests/auto/qml/v4/data/nestedLogicalOr.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.v4 1.0 - -Result { - property bool val1: false - property bool val2: true - property bool val3: false - - property bool b1: (false || false || true) - property bool b2: (false || (false || true)) - property bool b3: ((false || false) || true) - property bool b4: (val1 || (val2 || val3)) ? true : false - - result: b1 && b2 && b3 && b4 -} diff --git a/tests/auto/qml/v4/data/nestedObjectAccess.qml b/tests/auto/qml/v4/data/nestedObjectAccess.qml deleted file mode 100644 index 56cd17e41e..0000000000 --- a/tests/auto/qml/v4/data/nestedObjectAccess.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.v4 1.0 - -Result { - result: nested.result -} diff --git a/tests/auto/qml/v4/data/nestedObjectAccess2.qml b/tests/auto/qml/v4/data/nestedObjectAccess2.qml deleted file mode 100644 index 2f0e0db01c..0000000000 --- a/tests/auto/qml/v4/data/nestedObjectAccess2.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.v4 1.0 - -Result { - result: nested2.result -} diff --git a/tests/auto/qml/v4/data/nullQObject.qml b/tests/auto/qml/v4/data/nullQObject.qml deleted file mode 100644 index 00185b3988..0000000000 --- a/tests/auto/qml/v4/data/nullQObject.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 - -Item { - property QtObject obj - property QtObject test - test: obj -} diff --git a/tests/auto/qml/v4/data/objectToBool.qml b/tests/auto/qml/v4/data/objectToBool.qml deleted file mode 100644 index 8c8a67bee0..0000000000 --- a/tests/auto/qml/v4/data/objectToBool.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property QtObject prop1: null - property QtObject prop2: QtObject {} - - property bool test1: prop1 ? true : false - property bool test2: prop2 ? true : false - - property bool test3: prop1 == false - property bool test4: prop1 === false - - property bool test5: prop2 == false - property bool test6: prop2 === false -} - diff --git a/tests/auto/qml/v4/data/qrealToIntRounding.qml b/tests/auto/qml/v4/data/qrealToIntRounding.qml deleted file mode 100644 index ee3d405073..0000000000 --- a/tests/auto/qml/v4/data/qrealToIntRounding.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int data: 1 - - property int test1: 6.6 + data - property int test2: 6.2 + data - property int test3: 6 + data -} - diff --git a/tests/auto/qml/v4/data/qtbug_21883.qml b/tests/auto/qml/v4/data/qtbug_21883.qml deleted file mode 100644 index a51f97c944..0000000000 --- a/tests/auto/qml/v4/data/qtbug_21883.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.v4 1.0 - -Result { - property Result dummy: Result -} diff --git a/tests/auto/qml/v4/data/qtbug_22816.qml b/tests/auto/qml/v4/data/qtbug_22816.qml deleted file mode 100644 index bfa8d4948c..0000000000 --- a/tests/auto/qml/v4/data/qtbug_22816.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.0 - -Item { - QtObject { - id: object - property bool prop1: true - function myfunction() { return true; } - property bool prop2: object.prop1 && myfunction(); - } - - property bool test1: object.prop1 && object.prop2 - property bool test2: object.prop1 - - Component.onCompleted: { - object.prop1 = false; - } -} - diff --git a/tests/auto/qml/v4/data/singletonType.qml b/tests/auto/qml/v4/data/singletonType.qml deleted file mode 100644 index 3fcbcae64d..0000000000 --- a/tests/auto/qml/v4/data/singletonType.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt.test 1.0 as ModApi -import QtQuick 2.0 - -Item { - property int testProp: ModApi.V4.ip - property int testProp2: 2 - - function getRandom() { - testProp2 = ModApi.V4.random(); - // testProp should also have changed. - } -} diff --git a/tests/auto/qml/v4/data/strictEquals.qml b/tests/auto/qml/v4/data/strictEquals.qml deleted file mode 100644 index 503ca50454..0000000000 --- a/tests/auto/qml/v4/data/strictEquals.qml +++ /dev/null @@ -1,53 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property QtObject myprop1: null - property QtObject myprop2: QtObject {} - property real zero: 0 - property bool falseProp: false - - property bool test1: myprop1 === false - property bool test2: myprop1 === null - property bool test3: 5 === myprop1 - property bool test4: null === myprop1 - property bool test5: myprop1 !== false - property bool test6: myprop1 !== null - property bool test7: 5 !== myprop1 - property bool test8: null !== myprop1 - - property bool test9: myprop2 === false - property bool test10: myprop2 === null - property bool test11: 5 === myprop2 - property bool test12: null === myprop2 - property bool test13: myprop2 !== false - property bool test14: myprop2 !== null - property bool test15: 5 !== myprop2 - property bool test16: null !== myprop2 - - property bool test17: myprop1 === myprop1 - property bool test18: myprop1 !== myprop1 - property bool test19: myprop1 === myprop2 - property bool test20: myprop1 !== myprop2 - property bool test21: myprop2 === myprop2 - property bool test22: myprop2 !== myprop2 - - property bool test23: myprop1 === "hello" - property bool test24: myprop1 !== "hello" - property bool test25: myprop2 === "hello" - property bool test26: myprop2 !== "hello" - - property bool test27: falseProp === zero - property bool test28: falseProp !== zero - property bool test29: falseProp === 1 - property bool test30: falseProp !== 1 - property bool test31: true === zero - property bool test32: true !== zero - property bool test33: true === 1 - property bool test34: true !== 1 - - property bool test35: zero === 5.0 - property bool test36: zero !== 5.0 - property bool test37: zero === 1 - property bool test38: zero !== 1 -} - diff --git a/tests/auto/qml/v4/data/stringComparison.qml b/tests/auto/qml/v4/data/stringComparison.qml deleted file mode 100644 index d9eab5389e..0000000000 --- a/tests/auto/qml/v4/data/stringComparison.qml +++ /dev/null @@ -1,41 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property string string1: "aaba" - property string string2: "aa" - property string string3: "aaab" - property string string4: "c" - property string string5: string2 + string4 - - property bool test1: string1 > string2 - property bool test2: string2 < string1 - property bool test3: string1 > string3 - property bool test4: string3 < string1 - property bool test5: string1 < string4 - property bool test6: string4 > string1 - property bool test7: string1 < string5 - property bool test8: string5 > string1 - - property bool test9: string1 == "aaba" - property bool test10: string1 != "baa" - property bool test11: string1 === "aaba" - property bool test12: string1 !== "baa" - property bool test13: string4 == "c" - property bool test14: string4 != "d" - property bool test15: string4 === "c" - property bool test16: string4 !== "d" - property bool test17: string5 === "aac" - property bool test18: string5 !== "aad" - - property bool test19: string1 >= string2 - property bool test20: string2 <= string1 - property bool test21: string1 >= string3 - property bool test22: string3 <= string1 - property bool test23: string1 <= string4 - property bool test24: string4 >= string1 - property bool test25: string4 <= "c" - property bool test26: string4 >= "c" - property bool test27: string5 <= "aac" - property bool test28: string5 >= "aac" -} - diff --git a/tests/auto/qml/v4/data/subscriptions.1.qml b/tests/auto/qml/v4/data/subscriptions.1.qml deleted file mode 100644 index 607233819e..0000000000 --- a/tests/auto/qml/v4/data/subscriptions.1.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - id: root - width: 400 - height: 400 - - property real targetHeight: menuItems.height + 1 - property real heightValue: if (1) menuItems.height //this must be v8? - property bool boolProp: menuItems.height > heightValue //this must be v4? - - Column { - id: menuItems - Item { height: 200; width: 10 } - } -} diff --git a/tests/auto/qml/v4/data/subscriptionsInConditionalExpressions.qml b/tests/auto/qml/v4/data/subscriptionsInConditionalExpressions.qml deleted file mode 100644 index a8e05eeda1..0000000000 --- a/tests/auto/qml/v4/data/subscriptionsInConditionalExpressions.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -Item { - id: thisTest - - property bool cond: true - property real a: 1 - property real result: cond ? a : a - - PropertyAction { running: true; target: thisTest; property: "a"; value: 2; } -} diff --git a/tests/auto/qml/v4/data/unaryMinus.qml b/tests/auto/qml/v4/data/unaryMinus.qml deleted file mode 100644 index 410654fc3c..0000000000 --- a/tests/auto/qml/v4/data/unaryMinus.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 - -Item { - property real test1: -i1.p2 - property int test2: -i1.p2 - property real test3: -i1.p1 - property int test4: -i1.p1 - property real test5: -i1.p3 - property int test6: -i1.p3 - property real test7: -i1.p4 - property int test8: -i1.p4 - property real test9: -i1.p5 - property int test10: -i1.p5 - - QtObject { - id: i1 - property real p1: -3.7 - property int p2: 18 - property real p3: -3.3 - property int p4: -7 - property real p5: 4.4 - } - } - diff --git a/tests/auto/qml/v4/data/unaryPlus.qml b/tests/auto/qml/v4/data/unaryPlus.qml deleted file mode 100644 index cd5315a7cc..0000000000 --- a/tests/auto/qml/v4/data/unaryPlus.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.0 - -Item { - property real test1: +i1.p2 - property int test2: +i1.p2 - property real test3: +i1.p1 - property int test4: +i1.p1 - property real test5: +i1.p3 - property int test6: +i1.p3 - property real test7: +i1.p4 - property int test8: +i1.p4 - property real test9: +i1.p5 - property int test10: +i1.p5 - - QtObject { - id: i1 - property real p1: -3.7 - property int p2: 18 - property real p3: -3.3 - property int p4: -7 - property real p5: 4.4 - } -} - diff --git a/tests/auto/qml/v4/data/unnecessaryReeval.qml b/tests/auto/qml/v4/data/unnecessaryReeval.qml deleted file mode 100644 index 48662d7a2d..0000000000 --- a/tests/auto/qml/v4/data/unnecessaryReeval.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.v4 1.0 - -Result { - property int a: 8 - property int b: 19 - result: (a == 8)?b:7 -} diff --git a/tests/auto/qml/v4/data/varHandling.qml b/tests/auto/qml/v4/data/varHandling.qml deleted file mode 100644 index c19e6a256f..0000000000 --- a/tests/auto/qml/v4/data/varHandling.qml +++ /dev/null @@ -1,67 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool pBool: true - property int pInt: 666 - property real pReal: 3.1415927 - property string pString: 'foo' - property url pUrl: 'http://tools.ietf.org/html/rfc3986#section-1.1.2' - property color pColor: Qt.rgba(1, 0, 0, 0.5) - property QtObject pObject: QtObject { property string foo: 'bar' } - - // Test assignment to var - property var pBoolVar: pBool - property var pIntVar: pInt - property var pRealVar: pReal - property var pStringVar: pString - property var pUrlVar: pUrl - property var pColorVar: pColor - property var pObjectVar: pObject - property var pNullVar: null - property var pVarVar: pUrlVar - - // Test equivalence - property bool boolConversionSuccess: (pBoolVar == true) - property bool intConversionSuccess: (pIntVar == 666) - property bool realConversionSuccess: (pRealVar == 3.1415927) - property bool stringConversionSuccess: (pStringVar == 'foo') - - property url comparisonUrl: 'http://tools.ietf.org/html/rfc3986#section-1.1.2' - property bool urlConversionSuccess: (pUrlVar == comparisonUrl) - - property color comparisonColor: Qt.rgba(1, 0, 0, 0.5) - property bool colorConversionSuccess: (pColorVar == comparisonColor) - - property bool objectConversionSuccess: (pObjectVar == pObject) - property bool nullConversionSuccess: (pNullVar == null) - - property bool varConversionSuccess: (pVarVar == comparisonUrl) - - // Operations are not handled by V4 - they should pass through correctly - property var pVarNot: !pBoolVar - property var pVarComplement: ~pIntVar - property var pVarEqual: (pBoolVar == pBoolVar) - property var pVarLiteralEqual: (pBoolVar == true) - property var pVarUnequal: (pUrlVar == pColorVar) - property var pVarComparison: (pIntVar <= pIntVar) - property var pVarShift: (pIntVar >> 1) - - Component.onCompleted: { - if (!boolConversionSuccess) console.warn('QV4: bool conversion failed'); - if (!intConversionSuccess) console.warn('QV4: int conversion failed'); - if (!realConversionSuccess) console.warn('QV4: real conversion failed'); - if (!stringConversionSuccess) console.warn('QV4: string conversion failed'); - if (!urlConversionSuccess) console.warn('QV4: url conversion failed'); - if (!colorConversionSuccess) console.warn('QV4: color conversion failed'); - if (!objectConversionSuccess) console.warn('QV4: object conversion failed'); - if (!nullConversionSuccess) console.warn('QV4: null conversion failed'); - if (!varConversionSuccess) console.warn('QV4: var conversion failed'); - if (pVarNot != false) console.warn('QV4: var negation impeded'); - if (pVarComplement != ~666) console.warn('QV4: var complement impeded'); - if (pVarEqual != true) console.warn('QV4: var equality impeded'); - if (pVarLiteralEqual != true) console.warn('QV4: var/literal equality impeded'); - if (pVarUnequal != false) console.warn('QV4: var unequality impeded'); - if (pVarComparison != true) console.warn('QV4: var comparison impeded'); - if (pVarShift != 333) console.warn('QV4: var shift impeded'); - } -} diff --git a/tests/auto/qml/v4/data/variantHandling.qml b/tests/auto/qml/v4/data/variantHandling.qml deleted file mode 100644 index 3d48eef57e..0000000000 --- a/tests/auto/qml/v4/data/variantHandling.qml +++ /dev/null @@ -1,67 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool pBool: true - property int pInt: 666 - property real pReal: 3.1415927 - property string pString: 'foo' - property url pUrl: 'http://tools.ietf.org/html/rfc3986#section-1.1.2' - property color pColor: Qt.rgba(1, 0, 0, 0.5) - property QtObject pObject: QtObject { property string foo: 'bar' } - - // Test assignment to variant - property variant pBoolVar: pBool - property variant pIntVar: pInt - property variant pRealVar: pReal - property variant pStringVar: pString - property variant pUrlVar: pUrl - property variant pColorVar: pColor - property variant pObjectVar: pObject - property variant pNullVar: null - property variant pVarVar: pUrlVar - - // Test equivalence - property bool boolConversionSuccess: (pBoolVar == true) - property bool intConversionSuccess: (pIntVar == 666) - property bool realConversionSuccess: (pRealVar == 3.1415927) - property bool stringConversionSuccess: (pStringVar == 'foo') - - property url comparisonUrl: 'http://tools.ietf.org/html/rfc3986#section-1.1.2' - property bool urlConversionSuccess: (pUrlVar == comparisonUrl) - - property color comparisonColor: Qt.rgba(1, 0, 0, 0.5) - property bool colorConversionSuccess: (pColorVar == comparisonColor) - - property bool objectConversionSuccess: (pObjectVar == pObject) - property bool nullConversionSuccess: (pNullVar == null) - - property bool variantConversionSuccess: (pVarVar == comparisonUrl) - - // Operations are not handled by V4 - they should pass through correctly - property variant pVarNot: !pBoolVar - property variant pVarComplement: ~pIntVar - property variant pVarEqual: (pBoolVar == pBoolVar) - property variant pVarLiteralEqual: (pBoolVar == true) - property variant pVarUnequal: (pUrlVar == pColorVar) - property variant pVarComparison: (pIntVar <= pIntVar) - property variant pVarShift: (pIntVar >> 1) - - Component.onCompleted: { - if (!boolConversionSuccess) console.warn('QV4: bool conversion failed'); - if (!intConversionSuccess) console.warn('QV4: int conversion failed'); - if (!realConversionSuccess) console.warn('QV4: real conversion failed'); - if (!stringConversionSuccess) console.warn('QV4: string conversion failed'); - if (!urlConversionSuccess) console.warn('QV4: url conversion failed'); - if (!colorConversionSuccess) console.warn('QV4: color conversion failed'); - if (!objectConversionSuccess) console.warn('QV4: object conversion failed'); - if (!nullConversionSuccess) console.warn('QV4: null conversion failed'); - if (!variantConversionSuccess) console.warn('QV4: variant conversion failed'); - if (pVarNot != false) console.warn('QV4: variant negation impeded'); - if (pVarComplement != ~666) console.warn('QV4: variant complement impeded'); - if (pVarEqual != true) console.warn('QV4: variant equality impeded'); - if (pVarLiteralEqual != true) console.warn('QV4: variant/literal equality impeded'); - if (pVarUnequal != false) console.warn('QV4: variant unequality impeded'); - if (pVarComparison != true) console.warn('QV4: variant comparison impeded'); - if (pVarShift != 333) console.warn('QV4: variant shift impeded'); - } -} diff --git a/tests/auto/qml/v4/testtypes.cpp b/tests/auto/qml/v4/testtypes.cpp deleted file mode 100644 index ba81e591fc..0000000000 --- a/tests/auto/qml/v4/testtypes.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include "testtypes.h" - -#include <QtQml/qqml.h> - -void registerTypes() -{ - qmlRegisterType<ResultObject>("Qt.v4", 1,0, "Result"); - qmlRegisterType<NestedObject>(); - qmlRegisterType<ConversionObject>("Qt.v4", 1, 0, "Conversion"); - qmlRegisterType<JSValueTest>("Qt.v4", 1, 0, "JSValueTest"); -} diff --git a/tests/auto/qml/v4/testtypes.h b/tests/auto/qml/v4/testtypes.h deleted file mode 100644 index ee516f2927..0000000000 --- a/tests/auto/qml/v4/testtypes.h +++ /dev/null @@ -1,216 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef TESTTYPES_H -#define TESTTYPES_H - -#include <QtCore/qobject.h> -#include <QtCore/qurl.h> -#include <QVector3D> -#include <QJSValue> - -class NestedObject : public QObject -{ - Q_OBJECT - Q_PROPERTY(int dummy READ dummy); - Q_PROPERTY(int result READ result FINAL CONSTANT); - -public: - int dummy() const { return 7; } - int result() const { return 37; } -}; - -class ResultObject : public QObject -{ - Q_OBJECT - Q_PROPERTY(int result READ result WRITE setResult FINAL) - Q_PROPERTY(NestedObject *nested READ nested CONSTANT) - Q_PROPERTY(NestedObject *nested2 READ nested2 FINAL CONSTANT) -public: - ResultObject() : m_result(0), m_resultCounter(0) {} - - int resultCounter() const { return m_resultCounter; } - void resetResultCounter() { m_resultCounter = 0; } - - int result() const { return m_result; } - void setResult(int result) { m_result = result; m_resultCounter++; } - - NestedObject *nested() { return &m_nested; } - NestedObject *nested2() { return &m_nested2; } - -private: - int m_result; - int m_resultCounter; - - NestedObject m_nested; - NestedObject m_nested2; -}; - -class ConversionObject : public QObject -{ - Q_OBJECT - - Q_PROPERTY(bool boolProp READ boolProp WRITE setBoolProp NOTIFY boolPropChanged) - Q_PROPERTY(int intProp READ intProp WRITE setIntProp NOTIFY intPropChanged) - Q_PROPERTY(float floatProp READ floatProp WRITE setFloatProp NOTIFY floatPropChanged) - Q_PROPERTY(double doubleProp READ doubleProp WRITE setDoubleProp NOTIFY doublePropChanged) - Q_PROPERTY(qreal qrealProp READ qrealProp WRITE setQrealProp NOTIFY qrealPropChanged) - Q_PROPERTY(QString qstringProp READ qstringProp WRITE setQstringProp NOTIFY qstringPropChanged) - Q_PROPERTY(QUrl qurlProp READ qurlProp WRITE setQurlProp NOTIFY qurlPropChanged) - Q_PROPERTY(QVector3D vec3Prop READ vec3Prop WRITE setVec3Prop NOTIFY vec3PropChanged) - Q_PROPERTY(QJSValue jsvalueProp READ jsvalueProp WRITE setJsvalueProp NOTIFY jsvaluePropChanged) - -public: - ConversionObject() : m_boolProp(false), m_intProp(0), m_floatProp(0.0), m_doubleProp(0.0), m_qrealProp(0.0) {} - ~ConversionObject() {} - - bool boolProp() const { return m_boolProp; } - void setBoolProp(bool v) { m_boolProp = v; emit boolPropChanged(); } - int intProp() const { return m_intProp; } - void setIntProp(int v) { m_intProp = v; emit intPropChanged(); } - float floatProp() const { return m_floatProp; } - void setFloatProp(float v) { m_floatProp = v; emit floatPropChanged(); } - double doubleProp() const { return m_doubleProp; } - void setDoubleProp(double v) { m_doubleProp = v; emit doublePropChanged(); } - qreal qrealProp() const { return m_qrealProp; } - void setQrealProp(qreal v) { m_qrealProp = v; emit qrealPropChanged(); } - QString qstringProp() const { return m_qstringProp; } - void setQstringProp(const QString& v) { m_qstringProp = v; emit qstringPropChanged(); } - QUrl qurlProp() const { return m_qurlProp; } - void setQurlProp(const QUrl& v) { m_qurlProp = v; emit qurlPropChanged(); } - QVector3D vec3Prop() const { return m_vec3Prop; } - void setVec3Prop(const QVector3D& v) { m_vec3Prop = v; emit vec3PropChanged(); } - QJSValue jsvalueProp() const { return m_jsvalueProp; } - void setJsvalueProp(const QJSValue &v) { m_jsvalueProp = v; emit jsvaluePropChanged(); } - -signals: - void boolPropChanged(); - void intPropChanged(); - void floatPropChanged(); - void doublePropChanged(); - void qrealPropChanged(); - void qstringPropChanged(); - void qurlPropChanged(); - void vec3PropChanged(); - void jsvaluePropChanged(); - -private: - bool m_boolProp; - int m_intProp; - float m_floatProp; - double m_doubleProp; - qreal m_qrealProp; - QString m_qstringProp; - QUrl m_qurlProp; - QVector3D m_vec3Prop; - QJSValue m_jsvalueProp; -}; - -class JSValueTest : public QObject -{ - Q_OBJECT - Q_PROPERTY(QJSValue boolVar READ boolVar WRITE setBoolVar NOTIFY boolVarChanged) - Q_PROPERTY(QJSValue intVar READ intVar WRITE setIntVar NOTIFY intVarChanged) - Q_PROPERTY(QJSValue realVar READ realVar WRITE setRealVar NOTIFY realVarChanged) - Q_PROPERTY(QJSValue stringVar READ stringVar WRITE setStringVar NOTIFY stringVarChanged) - Q_PROPERTY(QJSValue urlVar READ urlVar WRITE setUrlVar NOTIFY urlVarChanged) - Q_PROPERTY(QJSValue colorVar READ colorVar WRITE setColorVar NOTIFY colorVarChanged) - Q_PROPERTY(QJSValue objectVar READ objectVar WRITE setObjectVar NOTIFY objectVarChanged) - Q_PROPERTY(QJSValue nullVar READ nullVar WRITE setNullVar NOTIFY nullVarChanged) - Q_PROPERTY(QJSValue varVar READ varVar WRITE setVarVar NOTIFY varVarChanged) - -public: - JSValueTest() {} - ~JSValueTest() {} - - QJSValue boolVar() const { return m_boolVar; } - void setBoolVar(const QJSValue &v) { m_boolVar = v; emit boolVarChanged(); } - - QJSValue intVar() const { return m_intVar; } - void setIntVar(const QJSValue &v) { m_intVar = v; emit intVarChanged(); } - - QJSValue realVar() const { return m_realVar; } - void setRealVar(const QJSValue &v) { m_realVar = v; emit realVarChanged(); } - - QJSValue stringVar() const { return m_stringVar; } - void setStringVar(const QJSValue &v) { m_stringVar = v; emit stringVarChanged(); } - - QJSValue urlVar() const { return m_urlVar; } - void setUrlVar(const QJSValue &v) { m_urlVar = v; emit urlVarChanged(); } - - QJSValue colorVar() const { return m_colorVar; } - void setColorVar(const QJSValue &v) { m_colorVar = v; emit colorVarChanged(); } - - QJSValue objectVar() const { return m_objectVar; } - void setObjectVar(const QJSValue &v) { m_objectVar = v; emit objectVarChanged(); } - - QJSValue nullVar() const { return m_nullVar; } - void setNullVar(const QJSValue &v) { m_nullVar = v; emit nullVarChanged(); } - - QJSValue varVar() const { return m_varVar; } - void setVarVar(const QJSValue &v) { m_varVar = v; emit varVarChanged(); } - -signals: - void boolVarChanged(); - void intVarChanged(); - void realVarChanged(); - void stringVarChanged(); - void urlVarChanged(); - void colorVarChanged(); - void objectVarChanged(); - void nullVarChanged(); - void varVarChanged(); - -private: - QJSValue m_boolVar; - QJSValue m_intVar; - QJSValue m_realVar; - QJSValue m_stringVar; - QJSValue m_urlVar; - QJSValue m_colorVar; - QJSValue m_objectVar; - QJSValue m_nullVar; - QJSValue m_varVar; -}; - -void registerTypes(); - -#endif // TESTTYPES_H - diff --git a/tests/auto/qml/v4/tst_v4.cpp b/tests/auto/qml/v4/tst_v4.cpp deleted file mode 100644 index e08bccd016..0000000000 --- a/tests/auto/qml/v4/tst_v4.cpp +++ /dev/null @@ -1,1125 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include <qtest.h> -#include <QtCore/qobject.h> -#include <QtCore/qfileinfo.h> -#include <QtCore/qdir.h> -#include <QtQml/qqmlengine.h> -#include <QtQml/qqmlcomponent.h> -#include <QtCore/qdebug.h> -#include <QtGui/qcolor.h> -#include <QtCore/qnumeric.h> - -#include <private/qv4compiler_p.h> - -#include "../../shared/util.h" -#include "testtypes.h" - -class tst_v4 : public QQmlDataTest -{ - Q_OBJECT -public: - tst_v4() {} - -private slots: - void initTestCase(); - - void unnecessaryReeval(); - void logicalOr(); - void nestedLogicalOr(); - void logicalAnd(); - void nestedLogicalAnd(); - void conditionalExpr(); - void qtscript(); - void qtscript_data(); - void nestedObjectAccess(); - void subscriptionsInConditionalExpressions(); - void qtbug_21883(); - void qtbug_22816(); - void stringComparison(); - void unaryMinus(); - void unaryPlus(); - void colorType(); - void mathAbs(); - void mathCeil(); - void mathFloor(); - void mathMax(); - void mathMin(); - void mathCos(); - void mathSin(); - void singletonType(); - void integerOperations(); - - void conversions_data(); - void conversions(); - void subscriptions(); - - void debuggingDumpInstructions(); // this test should be last. - -private: - QQmlEngine engine; -}; - -void tst_v4::initTestCase() -{ - QQmlDataTest::initTestCase(); - registerTypes(); -} - -void tst_v4::qtscript() -{ - QFETCH(QString, file); - QV4Compiler::enableBindingsTest(true); - - QQmlComponent component(&engine, testFileUrl(file)); - - QQmlTestMessageHandler messageHandler; - - QObject *o = component.create(); - delete o; - - QEXPECT_FAIL("jsvalueHandling", "QTBUG-26951 - QJSValue has a different representation of NULL to QV8Engine", Continue); - const int v4ErrorCount = messageHandler.messages().filter(QLatin1String("QV4")).size(); - QVERIFY2(v4ErrorCount == 0, qPrintable(messageHandler.messageString())); - - QV4Compiler::enableBindingsTest(false); -} - -void tst_v4::qtscript_data() -{ - QTest::addColumn<QString>("file"); - - QTest::newRow("equals") << "equals.qml"; - QTest::newRow("strict equals") << "strictEquals.qml"; - QTest::newRow("qreal -> int rounding") << "qrealToIntRounding.qml"; - QTest::newRow("exception on fetch") << "fetchException.qml"; - QTest::newRow("logical or") << "logicalOr.qml"; - QTest::newRow("conditional expressions") << "conditionalExpr.qml"; - QTest::newRow("double bool jump") << "doubleBoolJump.qml"; - QTest::newRow("unary minus") << "unaryMinus.qml"; - QTest::newRow("null qobject") << "nullQObject.qml"; - QTest::newRow("qobject -> bool") << "objectToBool.qml"; - QTest::newRow("conversion from bool") << "conversions.1.qml"; - QTest::newRow("conversion from int") << "conversions.2.qml"; - QTest::newRow("conversion from float") << "conversions.3.qml"; - QTest::newRow("conversion from double") << "conversions.4.qml"; - QTest::newRow("conversion from real") << "conversions.5.qml"; - QTest::newRow("conversion from string") << "conversions.6.qml"; - QTest::newRow("conversion from url") << "conversions.7.qml"; - QTest::newRow("conversion from vec3") << "conversions.8.qml"; - QTest::newRow("variantHandling") << "variantHandling.qml"; - QTest::newRow("varHandling") << "varHandling.qml"; - QTest::newRow("jsvalueHandling") << "jsvalueHandling.qml"; - QTest::newRow("integerOperations") << "integerOperations.qml"; -} - -void tst_v4::unnecessaryReeval() -{ - QQmlComponent component(&engine, testFileUrl("unnecessaryReeval.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->resultCounter(), 1); - QCOMPARE(ro->result(), 19); - ro->resetResultCounter(); - - ro->setProperty("b", 6); - - QCOMPARE(ro->resultCounter(), 1); - QCOMPARE(ro->result(), 6); - ro->resetResultCounter(); - - ro->setProperty("a", 14); - - QCOMPARE(ro->resultCounter(), 1); - QCOMPARE(ro->result(), 7); - ro->resetResultCounter(); - - ro->setProperty("b", 14); - QCOMPARE(ro->resultCounter(), 0); - QCOMPARE(ro->result(), 7); - - delete o; -} - -void tst_v4::logicalOr() -{ - { - QQmlComponent component(&engine, testFileUrl("logicalOr.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 0); - delete o; - } - - { - QQmlComponent component(&engine, testFileUrl("logicalOr.2.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 1); - delete o; - } -} - -void tst_v4::nestedLogicalOr() -{ - //we are primarily testing that v4 does not get caught in a loop (QTBUG-24038) - QQmlComponent component(&engine, testFileUrl("nestedLogicalOr.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 1); - delete o; -} - -void tst_v4::logicalAnd() -{ - { - QQmlComponent component(&engine, testFileUrl("logicalAnd.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 0); - delete o; - } - - { - QQmlComponent component(&engine, testFileUrl("logicalAnd.2.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 1); - delete o; - } - - { - QQmlComponent component(&engine, testFileUrl("logicalAnd.3.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 1); - delete o; - } - - { - // QTBUG-24660 - QQmlComponent component(&engine, testFileUrl("logicalAnd.4.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 1); - delete o; - } - - { - QQmlComponent component(&engine, testFileUrl("logicalAnd.5.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 1); - delete o; - } - - { - QQmlComponent component(&engine, testFileUrl("logicalAnd.6.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 1); - delete o; - } - - { - QQmlComponent component(&engine, testFileUrl("logicalAnd.7.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 1); - delete o; - } -} - -void tst_v4::nestedLogicalAnd() -{ - QQmlComponent component(&engine, testFileUrl("nestedLogicalAnd.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 1); - delete o; -} - -void tst_v4::conditionalExpr() -{ - { - QQmlComponent component(&engine, testFileUrl("conditionalExpr.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 0); - delete o; - } -} - -// This would previously use the metaObject of the root element to result the nested access. -// That is, the index for accessing "result" would have been RootObject::result, instead of -// NestedObject::result. -void tst_v4::nestedObjectAccess() -{ - { - QQmlComponent component(&engine, testFileUrl("nestedObjectAccess.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 37); - - delete o; - } - - { - QQmlComponent component(&engine, testFileUrl("nestedObjectAccess2.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - ResultObject *ro = qobject_cast<ResultObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->result(), 37); - - delete o; - } -} - -void tst_v4::subscriptionsInConditionalExpressions() -{ - QQmlComponent component(&engine, testFileUrl("subscriptionsInConditionalExpressions.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QObject *ro = qobject_cast<QObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->property("result").toReal(), qreal(2)); - - delete o; -} - -// Crash test -void tst_v4::qtbug_21883() -{ - QQmlComponent component(&engine, testFileUrl("qtbug_21883.qml")); - - QString warning = component.url().toString() + ":4: Unable to assign null to ResultObject*"; - QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); - - QObject *o = component.create(); - QVERIFY(o != 0); - delete o; -} - -void tst_v4::qtbug_22816() -{ - QQmlComponent component(&engine, testFileUrl("qtbug_22816.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - QCOMPARE(o->property("test1").toBool(), false); - QCOMPARE(o->property("test2").toBool(), false); - delete o; -} - -void tst_v4::stringComparison() -{ - QQmlComponent component(&engine, testFileUrl("stringComparison.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - QCOMPARE(o->property("test1").toBool(), true); - QCOMPARE(o->property("test2").toBool(), true); - QCOMPARE(o->property("test3").toBool(), true); - QCOMPARE(o->property("test4").toBool(), true); - QCOMPARE(o->property("test5").toBool(), true); - QCOMPARE(o->property("test6").toBool(), true); - QCOMPARE(o->property("test7").toBool(), true); - QCOMPARE(o->property("test8").toBool(), true); - QCOMPARE(o->property("test9").toBool(), true); - QCOMPARE(o->property("test10").toBool(), true); - QCOMPARE(o->property("test11").toBool(), true); - QCOMPARE(o->property("test12").toBool(), true); - QCOMPARE(o->property("test13").toBool(), true); - QCOMPARE(o->property("test14").toBool(), true); - QCOMPARE(o->property("test15").toBool(), true); - QCOMPARE(o->property("test16").toBool(), true); - QCOMPARE(o->property("test17").toBool(), true); - QCOMPARE(o->property("test18").toBool(), true); - QCOMPARE(o->property("test19").toBool(), true); - QCOMPARE(o->property("test20").toBool(), true); - QCOMPARE(o->property("test21").toBool(), true); - QCOMPARE(o->property("test22").toBool(), true); - delete o; -} - -void tst_v4::unaryMinus() -{ - QQmlComponent component(&engine, testFileUrl("unaryMinus.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QCOMPARE(o->property("test1").toReal(), qreal(-18)); - QCOMPARE(o->property("test2").toInt(), -18); - QCOMPARE(o->property("test3").toReal(), qreal(3.7)); - QCOMPARE(o->property("test4").toInt(), 4); - QCOMPARE(o->property("test5").toReal(), qreal(3.3)); - QCOMPARE(o->property("test6").toInt(), 3); - QCOMPARE(o->property("test7").toReal(), qreal(7)); - QCOMPARE(o->property("test8").toInt(), 7); - QCOMPARE(o->property("test9").toReal(), qreal(-4.4)); - QCOMPARE(o->property("test10").toInt(), -4); - - delete o; -} - -void tst_v4::unaryPlus() -{ - QQmlComponent component(&engine, testFileUrl("unaryPlus.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QCOMPARE(o->property("test1").toReal(), qreal(18)); - QCOMPARE(o->property("test2").toInt(), 18); - QCOMPARE(o->property("test3").toReal(), qreal(-3.7)); - QCOMPARE(o->property("test4").toInt(), -4); - QCOMPARE(o->property("test5").toReal(), qreal(-3.3)); - QCOMPARE(o->property("test6").toInt(), -3); - QCOMPARE(o->property("test7").toReal(), qreal(-7)); - QCOMPARE(o->property("test8").toInt(), -7); - QCOMPARE(o->property("test9").toReal(), qreal(4.4)); - QCOMPARE(o->property("test10").toInt(), 4); - - delete o; -} - -void tst_v4::colorType() -{ - QQmlComponent component(&engine, testFileUrl("colorType.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - QCOMPARE(o->property("test1").value<QColor>(), QColor("red")); - QCOMPARE(o->property("test2").value<QColor>(), QColor("red")); - QCOMPARE(o->property("test3").value<QColor>(), QColor("red")); - QCOMPARE(o->property("test4").toBool(), true); - QCOMPARE(o->property("test5").toBool(), true); - QCOMPARE(o->property("test6").toBool(), true); - QCOMPARE(o->property("test7").toBool(), true); - delete o; -} - -void tst_v4::mathAbs() -{ - QQmlComponent component(&engine, testFileUrl("mathAbs.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QCOMPARE(o->property("test1").toReal(), qreal(3.7)); - QCOMPARE(o->property("test2").toReal(), qreal(4.5)); - QCOMPARE(o->property("test3").toInt(), 18); - QCOMPARE(o->property("test4").toInt(), 72); - QCOMPARE(o->property("test5").toBool(), true); - QCOMPARE(o->property("test6").toBool(), true); - QCOMPARE(o->property("test7").toBool(), true); - QCOMPARE(o->property("test8").toInt(), 82); - QCOMPARE(o->property("test9").toBool(), true); - QCOMPARE(o->property("test10").toBool(), true); - QCOMPARE(o->property("test11").toInt(), 0); - QCOMPARE(o->property("test12").toBool(), true); - - delete o; -} - -void tst_v4::mathCeil() -{ - QQmlComponent component(&engine, testFileUrl("mathCeil.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QCOMPARE(o->property("test1").toReal(), qreal(-3)); - QCOMPARE(o->property("test2").toReal(), qreal(5)); - QCOMPARE(o->property("test3").toBool(), true); - QCOMPARE(o->property("test4").toBool(), true); - QCOMPARE(o->property("test5").toBool(), true); - QCOMPARE(o->property("test6").toReal(), qreal(83)); - QCOMPARE(o->property("test7").toBool(), true); - QCOMPARE(o->property("test8").toBool(), true); - QCOMPARE(o->property("test9").toInt(), 0); - QCOMPARE(o->property("test10").toBool(), true); - QCOMPARE(o->property("test11").toBool(), true); - - delete o; -} - -void tst_v4::mathFloor() -{ - QQmlComponent component(&engine, testFileUrl("mathFloor.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QCOMPARE(o->property("test1").toReal(), qreal(-4)); - QCOMPARE(o->property("test2").toReal(), qreal(4)); - QCOMPARE(o->property("test3").toBool(), true); - QCOMPARE(o->property("test4").toBool(), true); - QCOMPARE(o->property("test5").toBool(), true); - QCOMPARE(o->property("test6").toReal(), qreal(82)); - QCOMPARE(o->property("test7").toBool(), true); - QCOMPARE(o->property("test8").toBool(), true); - QCOMPARE(o->property("test9").toInt(), 0); - QCOMPARE(o->property("test10").toBool(), true); - - delete o; -} - -void tst_v4::mathMax() -{ - QQmlComponent component(&engine, testFileUrl("mathMax.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QCOMPARE(o->property("test1").toReal(), qreal(4.4)); - QCOMPARE(o->property("test2").toReal(), qreal(7)); - QCOMPARE(o->property("test3").toBool(), true); - QCOMPARE(o->property("test4").toBool(), true); - QCOMPARE(o->property("test5").toBool(), true); - QCOMPARE(o->property("test6").toReal(), qreal(82.6)); - QCOMPARE(o->property("test7").toReal(), qreal(4.4)); - QCOMPARE(o->property("test8").toBool(), true); - QCOMPARE(o->property("test9").toBool(), true); - QCOMPARE(o->property("test10").toBool(), true); - QCOMPARE(o->property("test11").toReal(), qreal(0)); - QCOMPARE(o->property("test12").toReal(), qreal(4.4)); - QCOMPARE(o->property("test13").toReal(), qreal(7)); - - delete o; -} - -void tst_v4::mathMin() -{ - QQmlComponent component(&engine, testFileUrl("mathMin.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QCOMPARE(o->property("test1").toReal(), qreal(-3.7)); - QCOMPARE(o->property("test2").toReal(), qreal(4.4)); - QCOMPARE(o->property("test3").toBool(), true); - QCOMPARE(o->property("test4").toBool(), true); - QCOMPARE(o->property("test5").toBool(), true); - QCOMPARE(o->property("test6").toReal(), qreal(82.6)); - QCOMPARE(o->property("test7").toBool(), true); - QCOMPARE(o->property("test8").toReal(), qreal(4.4)); - QCOMPARE(o->property("test9").toBool(), true); - QCOMPARE(o->property("test10").toBool(), true); - QCOMPARE(o->property("test11").toReal(), qreal(-3.7)); - QCOMPARE(o->property("test12").toReal(), qreal(0)); - QCOMPARE(o->property("test13").toReal(), qreal(-3.7)); - delete o; -} - -static bool fuzzyCompare(qreal a, qreal b) -{ - const qreal EPSILON = 0.0001; - return (a + EPSILON > b) && (a - EPSILON < b); -} - -void tst_v4::mathCos() -{ - QQmlComponent component(&engine, testFileUrl("mathCos.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QVERIFY(fuzzyCompare(o->property("test1").toReal(), qreal(-0.848100))); - QVERIFY(fuzzyCompare(o->property("test2").toReal(), qreal(-0.307333))); - QCOMPARE(o->property("test3").toBool(), true); - QCOMPARE(o->property("test4").toBool(), true); - QCOMPARE(o->property("test5").toBool(), true); - QVERIFY(fuzzyCompare(o->property("test6").toReal(), qreal(0.606941))); - QCOMPARE(o->property("test7").toBool(), true); - QCOMPARE(o->property("test8").toBool(), true); - QCOMPARE(o->property("test9").toBool(), true); - QCOMPARE(o->property("test10").toBool(), true); - QVERIFY(fuzzyCompare(o->property("test11").toReal(), qreal(0.890792))); - - delete o; -} - -void tst_v4::mathSin() -{ - QQmlComponent component(&engine, testFileUrl("mathSin.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QVERIFY(fuzzyCompare(o->property("test1").toReal(), qreal(0.529836))); - QVERIFY(fuzzyCompare(o->property("test2").toReal(), qreal(-0.951602))); - QCOMPARE(o->property("test3").toBool(), true); - QCOMPARE(o->property("test4").toBool(), true); - QCOMPARE(o->property("test5").toBool(), true); - QVERIFY(fuzzyCompare(o->property("test6").toReal(), qreal(0.794747))); - QCOMPARE(o->property("test7").toBool(), true); - QCOMPARE(o->property("test8").toBool(), true); - QCOMPARE(o->property("test9").toBool(), true); - QCOMPARE(o->property("test10").toBool(), true); - QVERIFY(fuzzyCompare(o->property("test11").toReal(), qreal(0.454411))); - - delete o; -} - -void tst_v4::integerOperations() -{ - QQmlComponent component(&engine, testFileUrl("integerOperations.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QCOMPARE(o->property("testa1").toInt(), 333); - QCOMPARE(o->property("testa2").toInt(), -666); - - QCOMPARE(o->property("testb1").toInt(), 0); - QCOMPARE(o->property("testb2").toInt(), 2); - QCOMPARE(o->property("testb3").toInt(), 0); - QCOMPARE(o->property("testb4").toInt(), 2); - QCOMPARE(o->property("testb5").toInt(), 0); - QCOMPARE(o->property("testb6").toInt(), 2); - QCOMPARE(o->property("testb7").toInt(), 0); - QCOMPARE(o->property("testb8").toInt(), 2); - - QCOMPARE(o->property("testc1").toInt(), 335); - QCOMPARE(o->property("testc2").toInt(), -666); - QCOMPARE(o->property("testc3").toInt(), 335); - QCOMPARE(o->property("testc4").toInt(), -666); - QCOMPARE(o->property("testc5").toInt(), 335); - QCOMPARE(o->property("testc6").toInt(), -666); - QCOMPARE(o->property("testc7").toInt(), 335); - QCOMPARE(o->property("testc8").toInt(), -666); - - QCOMPARE(o->property("testd1").toInt(), 330); - QCOMPARE(o->property("testd2").toInt(), 330); - QCOMPARE(o->property("testd3").toInt(), 330); - QCOMPARE(o->property("testd4").toInt(), 330); - - QCOMPARE(o->property("teste1").toInt(), 28); - QCOMPARE(o->property("teste2").toInt(), -28); - QCOMPARE(o->property("teste3").toInt(), 256); - QCOMPARE(o->property("teste4").toInt(), 28); - QCOMPARE(o->property("teste5").toInt(), -28); - QCOMPARE(o->property("teste6").toInt(), 256); - - QCOMPARE(o->property("testf1").toInt(), 1); - QCOMPARE(o->property("testf2").toInt(), -2); - QCOMPARE(o->property("testf3").toInt(), 0); - QCOMPARE(o->property("testf4").toInt(), 1); - QCOMPARE(o->property("testf5").toInt(), -2); - QCOMPARE(o->property("testf6").toInt(), 0); - - QCOMPARE(o->property("testg1").toInt(), 1); - QCOMPARE(o->property("testg2").toInt(), 0x3FFFFFFE); - QCOMPARE(o->property("testg3").toInt(), 0); - QCOMPARE(o->property("testg4").toInt(), 1); - QCOMPARE(o->property("testg5").toInt(), 0x3FFFFFFE); - QCOMPARE(o->property("testg6").toInt(), 0); - - delete o; -} - -class V4SingletonType : public QObject -{ - Q_OBJECT - Q_PROPERTY(int ip READ ip WRITE setIp NOTIFY ipChanged FINAL) -public: - V4SingletonType() : m_ip(12) {} - ~V4SingletonType() {} - - Q_INVOKABLE int random() { static int prng = 3; prng++; m_ip++; emit ipChanged(); return prng; } - - int ip() const { return m_ip; } - void setIp(int v) { m_ip = v; emit ipChanged(); } - -signals: - void ipChanged(); - -private: - int m_ip; -}; - -static QObject *v4_module_api_factory(QQmlEngine*, QJSEngine*) -{ - return new V4SingletonType; -} - -void tst_v4::singletonType() -{ - // register singleton type, providing typeinfo via template - qmlRegisterSingletonType<V4SingletonType>("Qt.test", 1, 0, "V4", v4_module_api_factory); - QQmlComponent component(&engine, testFileUrl("singletonType.qml")); - QObject *o = component.create(); - QVERIFY(o != 0); - QCOMPARE(o->property("testProp").toInt(), 12); - QCOMPARE(o->property("testProp2").toInt(), 2); - QMetaObject::invokeMethod(o, "getRandom"); - QCOMPARE(o->property("testProp").toInt(), 13); - QCOMPARE(o->property("testProp2").toInt(), 4); - delete o; -} - -void tst_v4::conversions_data() -{ - QTest::addColumn<QUrl>("file"); - QTest::addColumn<QStringList>("warnings"); - QTest::addColumn<bool>("boolProp"); - QTest::addColumn<int>("intProp"); - QTest::addColumn<float>("floatProp"); - QTest::addColumn<double>("doubleProp"); - QTest::addColumn<qreal>("qrealProp"); - QTest::addColumn<QString>("qstringProp"); - QTest::addColumn<QUrl>("qurlProp"); - QTest::addColumn<QVector3D>("vec3Prop"); - - QTest::newRow("from bool") << testFileUrl("conversions.1.qml") - << (QStringList() << (testFileUrl("conversions.1.qml").toString() + QLatin1String(":11:15: Unable to assign bool to QUrl"))) - << true - << (int)true - << (float)1.0 - << (double)1.0 - << (qreal)1.0 - << QString(QLatin1String("true")) - << QUrl() // cannot assign bool to url. - << QVector3D(1, 1, 1); - - QTest::newRow("from integer") << testFileUrl("conversions.2.qml") - << (QStringList() << (testFileUrl("conversions.2.qml").toString() + QLatin1String(":11:15: Unable to assign int to QUrl"))) - << (bool)4 - << 4 - << (float)4.0 - << (double)4.0 - << (qreal)4.0 - << QString(QLatin1String("4")) - << QUrl() // cannot assign int to url. - << QVector3D(4, 4, 4); - - QTest::newRow("from float") << testFileUrl("conversions.3.qml") - << (QStringList() << (testFileUrl("conversions.3.qml").toString() + QLatin1String(":11:15: Unable to assign number to QUrl"))) - << (bool)4.4 - << (int)4.4 - << (float)4.4 - << (double)((float)4.4) - << (qreal)((float)4.4) - << QString::number((double)((float)4.4), 'g', 16) - << QUrl() // cannot assign number to url. - << QVector3D(4.4, 4.4, 4.4); - - QTest::newRow("from double") << testFileUrl("conversions.4.qml") - << (QStringList() << (testFileUrl("conversions.4.qml").toString() + QLatin1String(":11:15: Unable to assign number to QUrl"))) - << (bool)4.444444444 - << (int)4.444444444 - << (float)4.444444444 - << (double)4.444444444 - << (qreal)4.444444444 - << QString::number((double)4.444444444, 'g', 16) - << QUrl() // cannot assign number to url. - << QVector3D(4.444444444, 4.444444444, 4.444444444); - - QTest::newRow("from qreal") << testFileUrl("conversions.5.qml") - << (QStringList() << (testFileUrl("conversions.5.qml").toString() + QLatin1String(":11:15: Unable to assign number to QUrl"))) - << (bool)4.44 - << (int)4.44 - << (float)4.44 - << (double)4.44 - << (qreal)4.44 - << QString(QLatin1String("4.44")) - << QUrl() // cannot assign number to url. - << QVector3D(4.44, 4.44, 4.44); - - QTest::newRow("from string") << testFileUrl("conversions.6.qml") - << (QStringList()) - << true - << 4 - << (float)4.0 - << (double)4.0 - << (qreal)4.0 - << QString(QLatin1String("4")) - << QUrl(testFileUrl("").toString() + QString(QLatin1String("4"))) - << QVector3D(4, 4, 4); - - QTest::newRow("from url") << testFileUrl("conversions.7.qml") - << (QStringList() << (testFileUrl("conversions.7.qml").toString() + QLatin1String(":6:14: Unable to assign QUrl to int")) - << (testFileUrl("conversions.7.qml").toString() + QLatin1String(":7:16: Unable to assign QUrl to number")) - << (testFileUrl("conversions.7.qml").toString() + QLatin1String(":8:17: Unable to assign QUrl to number")) - << (testFileUrl("conversions.7.qml").toString() + QLatin1String(":9:16: Unable to assign QUrl to number"))) - << true - << 0 - << (float) 0 - << (double) 0 - << (qreal) 0 - << QString(testFileUrl("").toString() + QString(QLatin1String("4"))) - << QUrl(testFileUrl("").toString() + QString(QLatin1String("4"))) - << QVector3D(qQNaN(), qQNaN(), qQNaN()); - - QTest::newRow("from vector") << testFileUrl("conversions.8.qml") - << (QStringList() << (testFileUrl("conversions.8.qml").toString() + QLatin1String(":11: Unable to assign QVector3D to QUrl")) - << (testFileUrl("conversions.8.qml").toString() + QLatin1String(":10: Unable to assign QVector3D to QString")) - << (testFileUrl("conversions.8.qml").toString() + QLatin1String(":9: Unable to assign QVector3D to double")) - << (testFileUrl("conversions.8.qml").toString() + QLatin1String(":8: Unable to assign QVector3D to double")) - << (testFileUrl("conversions.8.qml").toString() + QLatin1String(":7: Unable to assign QVector3D to float")) - << (testFileUrl("conversions.8.qml").toString() + QLatin1String(":6: Unable to assign QVector3D to int"))) - << true // non-null therefore true - << (int)0 // the other values should be the default-ctor values. - << (float)0 - << (double)0 - << (qreal)0 - << QString() - << QUrl() - << QVector3D(4, 4, 4); // except this one. -} - -#define COMPARE_NUMBER(type, prop, expected) \ - if (qIsNaN(expected)) \ - QVERIFY(qIsNaN(qvariant_cast<type>(prop))); \ - else \ - QCOMPARE((prop), QVariant::fromValue<type>(expected)); - -void tst_v4::conversions() -{ - QFETCH(QUrl, file); - QFETCH(QStringList, warnings); - QFETCH(bool, boolProp); - QFETCH(int, intProp); - QFETCH(float, floatProp); - QFETCH(double, doubleProp); - QFETCH(qreal, qrealProp); - QFETCH(QString, qstringProp); - QFETCH(QUrl, qurlProp); - QFETCH(QVector3D, vec3Prop); - - foreach (const QString &w, warnings) - QTest::ignoreMessage(QtWarningMsg, qPrintable(w)); - - QQmlComponent component(&engine, file); - QObject *o = component.create(); - QVERIFY(o != 0); - QCOMPARE(o->property("boolProp"), QVariant::fromValue<bool>(boolProp)); - QCOMPARE(o->property("intProp"), QVariant::fromValue<int>(intProp)); - COMPARE_NUMBER(float, o->property("floatProp"), floatProp); - COMPARE_NUMBER(double, o->property("doubleProp"), doubleProp); - COMPARE_NUMBER(qreal, o->property("qrealProp"), qrealProp); - QCOMPARE(o->property("qstringProp"), QVariant::fromValue<QString>(qstringProp)); - QCOMPARE(o->property("qurlProp"), QVariant::fromValue<QUrl>(qurlProp)); - - QVector3D vec3 = qvariant_cast<QVector3D>(o->property("vec3Prop")); - COMPARE_NUMBER(qreal, QVariant::fromValue<qreal>(vec3.x()), vec3Prop.x()); - COMPARE_NUMBER(qreal, QVariant::fromValue<qreal>(vec3.y()), vec3Prop.y()); - COMPARE_NUMBER(qreal, QVariant::fromValue<qreal>(vec3.z()), vec3Prop.z()); - delete o; -} - -void tst_v4::subscriptions() -{ - { - QQmlComponent component(&engine, testFileUrl("subscriptions.1.qml")); - - QObject *o = component.create(); - QVERIFY(o != 0); - - QObject *ro = qobject_cast<QObject *>(o); - QVERIFY(ro != 0); - - QCOMPARE(ro->property("targetHeight"), QVariant::fromValue<qreal>(201)); - - delete o; - } -} - -static QByteArray getAddress(int address) -{ - return QByteArray::number(address); -} - -static QByteArray getLeading(int address) -{ - QByteArray leading; - if (address != -1) { - leading = getAddress(address); - leading.prepend(QByteArray(8 - leading.count(), ' ')); - } - return leading; -} - -#include <private/qv4instruction_p.h> -void tst_v4::debuggingDumpInstructions() -{ - QStringList expectedPreAddress; - expectedPreAddress << "\t\tNoop"; - expectedPreAddress << "\t0:0:"; - expectedPreAddress << "\t\tSubscribeId\t\tId_Offset(0) -> Subscribe_Slot(0)"; - expectedPreAddress << "\t\tFetchAndSubscribe\tObject_Reg(0) Fast_Accessor(0x0) -> Output_Reg(0) Subscription_Slot(0)"; - expectedPreAddress << "\t\tLoadId\t\t\tId_Offset(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLoadScope\t\t-> Output_Reg(0)"; - expectedPreAddress << "\t\tLoadRoot\t\t-> Output_Reg(0)"; - expectedPreAddress << "\t\tLoadSingletonObject\t\t) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLoadAttached\t\tObject_Reg(0) Attached_Index(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tUnaryNot\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tUnaryMinusNumber\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tUnaryMinusInt\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tUnaryPlusNumber\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tUnaryPlusInt\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertBoolToInt\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertBoolToJSValue\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertBoolToNumber\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertBoolToString\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertBoolToVariant\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertBoolToVar\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertIntToBool\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertIntToJSValue\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertIntToNumber\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertIntToString\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertIntToVariant\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertIntToVar\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertJSValueToVar\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNumberToBool\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNumberToInt\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNumberToJSValue\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNumberToString\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNumberToVariant\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNumberToVar\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertStringToBool\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertStringToInt\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertStringToJSValue\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertStringToNumber\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertStringToUrl\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertStringToColor\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertStringToVariant\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertStringToVar\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertUrlToBool\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertUrlToJSValue\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertUrlToString\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertUrlToVariant\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertUrlToVar\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertColorToBool\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertColorToJSValue\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertColorToString\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertColorToVariant\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertColorToVar\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertObjectToBool\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertObjectToJSValue\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertObjectToVariant\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertObjectToVar\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertVarToJSValue\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNullToJSValue\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNullToObject\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNullToVariant\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tConvertNullToVar\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tResolveUrl\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMathSinNumber\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMathCosNumber\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMathAbsNumber\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMathRoundNumber\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMathFloorNumber\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMathCeilNumber\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMathPINumber\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLoadNull\t\tConstant(null) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLoadNumber\t\tConstant(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLoadInt\t\t\tConstant(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLoadBool\t\tConstant(false) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLoadString\t\tString_DataIndex(0) String_Length(0) -> Output_Register(0)"; - expectedPreAddress << "\t\tEnableV4Test\t\tString_DataIndex(0) String_Length(0)"; - expectedPreAddress << "\t\tTestV4Store\t\tInput_Reg(0) Reg_Type(0)"; - expectedPreAddress << "\t\tBitAndInt\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tBitOrInt\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tBitXorInt\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tAddNumber\t\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tAddString\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tSubNumber\t\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMulNumber\t\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tDivNumber\t\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tModNumber\t\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLShiftInt\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tRShiftInt\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tURShiftInt\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tGtNumber\t\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLtNumber\t\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tGeNumber\t\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLeNumber\t\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tEqualNumber\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tNotEqualNumber\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tStrictEqualNumber\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tStrictNotEqualNumber\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tGtString\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLtString\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tGeString\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tLeString\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tEqualString\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tNotEqualString\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tStrictEqualString\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tStrictNotEqualString\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tEqualObject\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tNotEqualObject\t\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tStrictEqualObject\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tStrictNotEqualObject\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMathMaxNumber\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tMathMinNumber\tInput_Reg(0) Input_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tNewString\t\tRegister(0)"; - expectedPreAddress << "\t\tNewUrl\t\t\tRegister(0)"; - expectedPreAddress << "\t\tCleanupRegister\t\tRegister(0)"; - expectedPreAddress << "\t\tCopy\t\t\tInput_Reg(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tFetch\t\t\tObject_Reg(0) Property_Index(0) -> Output_Reg(0)"; - expectedPreAddress << "\t\tStore\t\t\tInput_Reg(0) -> Object_Reg(0) Property_Index(0)"; - expectedPreAddress << "\t\tJump\t\t\tAddress(UNIT_TEST_JUMP_ADDRESS) [if false == Input_Reg(0)]"; //(address + size() + i->jump.count) - expectedPreAddress << "\t\tBranchTrue\t\tAddress(UNIT_TEST_BRANCH_ADDRESS) [if true == Input_Reg(0)]"; //(address + size() + i->branchop.offset) - expectedPreAddress << "\t\tBranchFalse\t\tAddress(UNIT_TEST_BRANCH_ADDRESS) [if false == Input_Reg(0)]"; //(address + size() + i->branchop.offset) - expectedPreAddress << "\t\tBranch\t\t\tAddress(UNIT_TEST_BRANCH_ADDRESS)"; //(address + size() + i->branchop.offset) - expectedPreAddress << "\t\tBlock\t\t\tMask(0)"; - expectedPreAddress << "\t\tThrow\t\t\tInputReg(0)"; - expectedPreAddress << "\t\tInitString\t\tString_DataIndex(0) -> String_Slot(0)"; - QStringList expected; - - QQmlTestMessageHandler messageHandler; - - QQmlJS::Bytecode bc; -#define DUMP_INSTR_IN_UNIT_TEST(I, FMT) { QQmlJS::V4InstrData<QQmlJS::V4Instr::I> i; memset(&i, 0, sizeof(i)); bc.append(i); } - FOR_EACH_V4_INSTR(DUMP_INSTR_IN_UNIT_TEST); -#undef DUMP_INSTR_IN_UNIT_TEST // NOTE: we memset in order to ensure stable output. - const char *start = bc.constData(); - const char *end = start + bc.size(); - const char *codeAddr = start; - int whichExpected = 0; -#define DUMP_INSTR_SIZE_IN_UNIT_TEST(I, FMT) { \ - QString currExpected = whichExpected < expectedPreAddress.size() ? expectedPreAddress.at(whichExpected++) : QString(); \ - currExpected.prepend(getLeading(codeAddr - start)); \ - expected.append(currExpected); \ - codeAddr += QQmlJS::V4Instr::size(static_cast<QQmlJS::V4Instr::Type>(QQmlJS::V4Instr::I)); \ - } - FOR_EACH_V4_INSTR(DUMP_INSTR_SIZE_IN_UNIT_TEST); -#undef DUMP_INSTR_SIZE_IN_UNIT_TEST // so that we generate the correct address for each instruction comparison - bc.dump(start, end); - - // ensure that the output was expected. - const int messageCount = messageHandler.messages().count(); - QCOMPARE(messageCount, expected.count()); - for (int ii = 0; ii < messageCount; ++ii) { - // Calculating the destination address of a null jump/branch instruction is tricky - // so instead we simply don't compare that part of those instructions. - QRegExp ignoreAddress("\\bAddress\\((\\w*)\\)"); - ignoreAddress.setMinimal(true); - QString expectOut = expected.at(ii); expectOut.replace(ignoreAddress, ""); - QString actualOut = messageHandler.messages().at(ii); actualOut.replace(ignoreAddress, ""); - QCOMPARE(actualOut, expectOut); - } -} - - -QTEST_MAIN(tst_v4) - -#include "tst_v4.moc" diff --git a/tests/auto/qml/v4/v4.pro b/tests/auto/qml/v4/v4.pro deleted file mode 100644 index 8c7c30e399..0000000000 --- a/tests/auto/qml/v4/v4.pro +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG += testcase -TARGET = tst_qqmlv4 -macx:CONFIG -= app_bundle - -SOURCES += tst_v4.cpp \ - testtypes.cpp -HEADERS += testtypes.h - -include (../../shared/util.pri) - -TESTDATA = data/* - -CONFIG += parallel_test - -QT += core-private gui-private v8-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 e3b1caa689..4069ad4c68 100644 --- a/tests/auto/quick/dialogs/dialogs.pro +++ b/tests/auto/quick/dialogs/dialogs.pro @@ -10,7 +10,7 @@ linux-*:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable win32: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/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index c14f191cb1..6a136aeb7e 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -64,6 +64,7 @@ #include "../../shared/platforminputcontext.h" #include <private/qinputmethod_p.h> #include <QtGui/qstylehints.h> +#include <qmath.h> #ifdef Q_OS_MAC #include <Carbon/Carbon.h> 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/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index 8c72be56a4..7a61ceb7fd 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -55,6 +55,7 @@ #include <QDebug> #include <QDir> #include <math.h> +#include <qmath.h> #ifdef Q_OS_MAC #include <Carbon/Carbon.h> @@ -5695,7 +5696,7 @@ void tst_qquicktextinput::QTBUG_19956_regexp() { QUrl url = testFileUrl("qtbug-19956regexp.qml"); - QString warning = url.toString() + ":11: Unable to assign [undefined] to QRegExp"; + QString warning = url.toString() + ":11:17: Unable to assign [undefined] to QRegExp"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); QQuickView window(url); diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro index fd80c66475..d9aff688ab 100644 --- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro +++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.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/qquickwindow/qquickwindow.pro b/tests/auto/quick/qquickwindow/qquickwindow.pro index 917e3a5196..46cf96423f 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 9172a224f7..574481c456 100644 --- a/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro +++ b/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro @@ -10,7 +10,7 @@ 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 OTHER_FILES += \ 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 378e199bf5..e7c50e6f54 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 |