summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-03 08:33:44 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-03 08:35:09 (GMT)
commit64a4b25fac94fc5c9b75ab31690c658e95189797 (patch)
tree6bc4b4b1a4a9bdcd6fda73052ad42cd287134b5c /tests
parent639ae76c6d1a46db546beb00c1d9022867ef7e2e (diff)
downloadQt-64a4b25fac94fc5c9b75ab31690c658e95189797.zip
Qt-64a4b25fac94fc5c9b75ab31690c658e95189797.tar.gz
Qt-64a4b25fac94fc5c9b75ab31690c658e95189797.tar.bz2
Save secondary scope inside the expression's scope object
This prevents the secondary scope from contaminating scopes outside itself when used as a signal expression. QTBUG-8641
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index e45f0fa..75ee7ce 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -1676,8 +1676,7 @@ void tst_qdeclarativeecmascript::scriptScope()
MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
QVERIFY(object != 0);
emit object->argumentSignal(19, "Hello world!", 10.3);
- QEXPECT_FAIL("", "QTBUG-8641", Continue);
- QCOMPARE(object->property("result").toString(), QLatin1String("undefined"));
+ QCOMPARE(object->property("result").toString(), QString());
delete object;
}