diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-03 05:16:35 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-03 05:16:35 (GMT) |
| commit | 13a014656cc1ce33790b3a83364d062158420b17 (patch) | |
| tree | 9aa4805bc6b3c970149f58b1553844f782045c72 /tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | |
| parent | 2ef17050f740b4e0debc43f66f26f419b317b7ab (diff) | |
| parent | 982ea31d6743da63fdcd5b32c14d54d84ab9714a (diff) | |
| download | Qt-13a014656cc1ce33790b3a83364d062158420b17.zip Qt-13a014656cc1ce33790b3a83364d062158420b17.tar.gz Qt-13a014656cc1ce33790b3a83364d062158420b17.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 8e7944d..85a3ef3 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -1678,7 +1678,6 @@ void tst_qdeclarativeecmascript::scriptScope() MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); emit object->basicSignal(); - QEXPECT_FAIL("", "QTBUG-8641", Continue); QCOMPARE(object->property("result").toString(), QLatin1String("world")); delete object; |