diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-03 04:36:17 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-03 04:48:46 (GMT) |
| commit | a2c2a287e6c405200ef990f3dddae9d229aac722 (patch) | |
| tree | 3b8c93173267e93ded50d793dab72112c3515573 /tests | |
| parent | 6e486bdd5cc8370df7752eda2fa9f75b0a962124 (diff) | |
| download | Qt-a2c2a287e6c405200ef990f3dddae9d229aac722.zip Qt-a2c2a287e6c405200ef990f3dddae9d229aac722.tar.gz Qt-a2c2a287e6c405200ef990f3dddae9d229aac722.tar.bz2 | |
Fix incorrect scope resolution for script in a script block.
Make sure global variables in a script file are searched before
component properties.
Task-number: QTBUG-8641
Diffstat (limited to 'tests')
| -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; |