Reduce usage of the strictMode flag in ExecutionContext

The goal is to completely get rid of it, and replace it by calling
strict/sloppy versions of runtime functions in the generated code.

Change-Id: Icd516d924136109abaf0dc9f3ef0e771a709485d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp
index 71140e5386..179c4120ae 100644
--- a/src/qml/jsruntime/qv4globalobject.cpp
+++ b/src/qml/jsruntime/qv4globalobject.cpp
@@ -360,10 +360,10 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) const
         return callData->args[0].asReturnedValue();
 
     const QString code = scode->toQString();
-    bool inheritContext = !ctx->d()->strictMode;
+    bool inheritContext = !ctx->d()->v4Function->isStrict();
 
     Script script(ctx, code, QStringLiteral("eval code"));
-    script.strictMode = (directCall && currentContext->d()->strictMode);
+    script.strictMode = (directCall && currentContext->d()->v4Function->isStrict());
     script.inheritContext = inheritContext;
     script.parse();
     if (v4->hasException)
@@ -373,7 +373,7 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) const
     if (!function)
         return Encode::undefined();
 
-    if (function->isStrict() || (ctx->d()->strictMode)) {
+    if (function->isStrict() || (ctx->d()->v4Function->isStrict())) {
         ScopedFunctionObject e(scope, FunctionObject::createScriptFunction(ctx, function));
         ScopedCallData callData(scope, 0);
         callData->thisObject = ctx->thisObject();