diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-13 16:59:40 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-15 23:40:14 +0200 |
commit | 4f1bfbdd4623d0909e4b2c94bd0b69e20d99d6f1 (patch) | |
tree | fe707b94e0530a9ecde5107c6a75c8c40bff42c9 /tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | |
parent | 738b5861ed39eb12bf6bdd96f24d18232e8406a3 (diff) |
Fix build of tst_qqmlecmascript
Comment out v8 persistent and weak reference handling related bits and
tests. Otherwise this auto test contains a lot of stuff we need.
Change-Id: Ieafd9c8ea5200e5429d6354243ccaddba4f4772e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp')
-rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 364359f1b8..5c0e277859 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -156,8 +156,10 @@ private slots: void singletonTypeCaching(); void singletonTypeImportOrder(); void singletonTypeResolution(); +#if 0 void importScripts_data(); void importScripts(); +#endif void scarceResources(); void scarceResources_data(); void scarceResources_other(); @@ -173,13 +175,13 @@ private slots: void propertyVarReparentNullContext(); void propertyVarCircular(); void propertyVarCircular2(); - void propertyVarInheritance(); - void propertyVarInheritance2(); +// void propertyVarInheritance(); +// void propertyVarInheritance2(); void elementAssign(); void objectPassThroughSignals(); void objectConversion(); void booleanConversion(); - void handleReferenceManagement(); +// void handleReferenceManagement(); void stringArg(); void readonlyDeclaration(); void sequenceConversionRead(); @@ -291,8 +293,8 @@ private slots: void stringParsing(); private: - static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter); - static void verifyContextLifetime(QQmlContextData *ctxt); +// static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter); +// static void verifyContextLifetime(QQmlContextData *ctxt); QQmlEngine engine; }; @@ -3767,6 +3769,7 @@ void tst_qqmlecmascript::singletonTypeResolution() delete object; } +#if 0 void tst_qqmlecmascript::verifyContextLifetime(QQmlContextData *ctxt) { QQmlContextData *childCtxt = ctxt->childContexts; @@ -3797,7 +3800,9 @@ void tst_qqmlecmascript::verifyContextLifetime(QQmlContextData *ctxt) { childCtxt = childCtxt->nextChild; } } +#endif +#if 0 void tst_qqmlecmascript::importScripts_data() { QTest::addColumn<QUrl>("testfile"); @@ -4040,6 +4045,7 @@ void tst_qqmlecmascript::importScripts() engine.setImportPathList(importPathList); } +#endif void tst_qqmlecmascript::scarceResources_other() { @@ -4840,6 +4846,7 @@ void tst_qqmlecmascript::propertyVarCircular2() delete object; } +#if 0 void tst_qqmlecmascript::propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter) { *(int*)(parameter) += 1; @@ -4923,6 +4930,7 @@ void tst_qqmlecmascript::propertyVarInheritance2() QVERIFY(propertyVarWeakRefCallbackCount == 1); // should have been collected now. delete object; } +#endif // Ensure that QObject type conversion works on binding assignment void tst_qqmlecmascript::elementAssign() @@ -4986,6 +4994,7 @@ void tst_qqmlecmascript::booleanConversion() delete object; } +#if 0 void tst_qqmlecmascript::handleReferenceManagement() { @@ -5304,6 +5313,7 @@ void tst_qqmlecmascript::handleReferenceManagement() delete object; } } +#endif void tst_qqmlecmascript::stringArg() { |