diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-03 05:00:00 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-03 05:00:00 (GMT) |
| commit | f604895f925599a4ce5ecf6350402e826acfa392 (patch) | |
| tree | 0b70db638c0e1b803dd02d2d446098a5f8181cb8 /tests/auto/declarative | |
| parent | 004f77f8ab4d07499116d151d6f2b015b57effac (diff) | |
| parent | a2c2a287e6c405200ef990f3dddae9d229aac722 (diff) | |
| download | Qt-f604895f925599a4ce5ecf6350402e826acfa392.zip Qt-f604895f925599a4ce5ecf6350402e826acfa392.tar.gz Qt-f604895f925599a4ce5ecf6350402e826acfa392.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative')
| -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; |