diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
| commit | bbc52bcbb6391c4925df26672eb1f26040c6f67c (patch) | |
| tree | 14b8580e21aecc5b08a35f69ac55e7fbc3aef3ba /src/qml/jsruntime/qv4globalobject.cpp | |
| parent | 5ff4facd8efc41b30b5ffa5abb6a12406685ca0b (diff) | |
| parent | cc0829cbf300e56360e3d61efe4dfd20efcabb1c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6e9b5fbf50da24cae9e555723a5f1d8365d4a2f3
Diffstat (limited to 'src/qml/jsruntime/qv4globalobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4globalobject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp index 43895011f3..1f747b62d7 100644 --- a/src/qml/jsruntime/qv4globalobject.cpp +++ b/src/qml/jsruntime/qv4globalobject.cpp @@ -371,6 +371,7 @@ ReturnedValue EvalFunction::evalCall(const Value *, const Value *argv, int argc, Function *function = script.function(); if (!function) return Encode::undefined(); + function->isEval = true; if (function->isStrict() || isStrict) { ScopedFunctionObject e(scope, FunctionObject::createScriptFunction(ctx, function)); |