aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-07-12 16:46:09 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-12 08:47:14 +0200
commit3ee8a19f5b7142b96e2df649ea0dac444b5622a2 (patch)
tree3517da5cdc05d65ceb11ee4d74d07b2a0efca2a7 /tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
parent4442dea01b9d4d45964228ac442166d89f091f9e (diff)
Enable support for QObject based module APIs
Task-number: QTBUG-17318 Change-Id: Ia887f563b337b1c34ff65a0559bb7f33c18b4e28 Reviewed-on: http://codereview.qt.nokia.com/1479 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 6f8764055a..22c2096ea4 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -2585,12 +2585,12 @@ void tst_qdeclarativeecmascript::signalWithUnknownTypes()
void tst_qdeclarativeecmascript::moduleApi()
{
- QSKIP("Module API not supported with V8", SkipAll);
-
QDeclarativeComponent component(&engine, TEST_FILE("moduleApi.qml"));
QObject *object = component.create();
QVERIFY(object != 0);
QCOMPARE(object->property("existingUriTest").toInt(), 20);
+
+ QEXPECT_FAIL("", "QTBUG-17318", Continue);
QCOMPARE(object->property("scriptTest").toInt(), 13);
QCOMPARE(object->property("qobjectTest").toInt(), 20);
QCOMPARE(object->property("qobjectMethodTest").toInt(), 1); // first call of method, so count = 1.
@@ -2604,6 +2604,7 @@ void tst_qdeclarativeecmascript::moduleApi()
object = componentTwo.create();
QVERIFY(object != 0);
QCOMPARE(object->property("existingUriTest").toInt(), 20);
+ QEXPECT_FAIL("", "QTBUG-17318", Continue);
QCOMPARE(object->property("scriptTest").toInt(), 13); // shouldn't have incremented.
QCOMPARE(object->property("qobjectParentedTest").toInt(), 26); // shouldn't have incremented.
delete object;