aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-08-07 14:43:03 +0200
committerLars Knoll <lars.knoll@qt.io>2017-08-10 08:18:50 +0000
commiteb2c08f57493aa12850e6cddff2cc3527e7cbfd7 (patch)
treebe917321e6025a8ca8983881a1f07d1a0fd7680c /src/qml/jsapi
parente9a8252305fa5e3b3cd4a18261990820975a79da (diff)
Get rid of ExecutionContext::strictMode
This should be done by generating different byte code for the strict/non strict cases. For now the VME has a workaround checking the isStrict() flag of QV4::Function. Change-Id: I2faa9e9184ffc5274491067e67f665d6989b54c2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsapi')
-rw-r--r--src/qml/jsapi/qjsengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 1c7540778b..61cc0294e2 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -446,7 +446,7 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in
QV4::ScopedValue result(scope);
QV4::Script script(ctx, program, fileName, lineNumber);
- script.strictMode = ctx->d()->strictMode;
+ script.strictMode = ctx->d()->v4Function ? ctx->d()->v4Function->isStrict() : false;
script.inheritContext = true;
script.parse();
if (!scope.engine->hasException)