Fix scope chain for eval in strict mode

Change-Id: Ie00046f98a126cd46cd79758a78be1d0e1d17c61
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/qml/v4/qv4globalobject.cpp b/src/qml/qml/v4/qv4globalobject.cpp
index 520fab6..0d4da29 100644 (file)
--- a/src/qml/qml/v4/qv4globalobject.cpp
+++ b/src/qml/qml/v4/qv4globalobject.cpp
@@ -387,8 +387,8 @@ Value EvalFunction::evalCall(ExecutionContext *parentContext, Value /*thisObject
     needsActivation = function->needsActivation();
 
     if (strictMode) {
-        CallContext *k = ctx->engine->newCallContext(this, ctx->thisObject, 0, 0);
-        ctx = k;
+        FunctionObject *e = engine->newScriptFunction(ctx, function);
+        return e->call(ctx->thisObject, 0, 0);
     }
 
     ExecutionContext::EvalCode evalCode;

diff --git a/tests/manual/v4/TestExpectations b/tests/manual/v4/TestExpectations
index b602e08..17cdc3b 100644 (file)
--- a/tests/manual/v4/TestExpectations
+++ b/tests/manual/v4/TestExpectations
@@ -5,8 +5,6 @@
 
 10.4.3-1-104 failing
 10.4.3-1-106 failing
-10.4.3-1-63-s failing
-10.4.3-1-82-s failing
 11.2.3-3_3 failing
 S11.8.6_A5_T2 failing
 S13_A15_T4 failing