diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-08 14:57:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-08 15:35:26 +0200 |
| commit | 3b8457712e7b98dd6ee88f0290deabdf46695598 (patch) | |
| tree | 758bbd21cf25294ce35e17109fe761101c3aa2e5 /tests | |
| parent | 8a273812ce2a9055d7cf2196e1b8a288bf0fc142 (diff) | |
Fix tst_qqmlecmascript::scope() and behavioural compatibility with v8 based qml
In the V8 based QML the global object would come _before_ the "QML global object",
which is the QML context (wrapper). We had a bunch of tests that verify the exact
scope chain and with this "compatibility" fix we can re-enable them.
Also fix missing prototype setup for the console object.
Change-Id: Ib3886f2d86472eb752a6ad1a2d8d89709548c5b4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index b06f006239..0db8351135 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -1284,7 +1284,6 @@ void tst_qqmlecmascript::scope() QVERIFY(object != 0); QCOMPARE(object->property("test1").toBool(), true); - QEXPECT_FAIL("", "Lookup in the global object vs. the QML context is not 100% correct right now ", Continue); QCOMPARE(object->property("test2").toBool(), true); QCOMPARE(object->property("test3").toBool(), true); |