diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 15:04:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 15:32:19 +0200 |
| commit | 07782f48f4318a7261f1b0ddcd686b19ec812e36 (patch) | |
| tree | 3fa2aa3a1170ad7ebaf5b1641cdce19a941ca480 /src/qml/jsruntime/qv4context.cpp | |
| parent | 50fcdfd705c2ad9560641986bf4152b017ee8bb6 (diff) | |
| parent | f15a90e5d10465e66698209a5d88f1e63ae336fa (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/qml/qqmlbinding.cpp
src/qml/jsruntime/qv4arraybuffer.cpp
src/qml/jsruntime/qv4functionobject.cpp
Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index 6d3ba2c516..0ef7d56c4d 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -167,7 +167,7 @@ Heap::CallContext::CallContext(ExecutionEngine *engine, QV4::Object *qml, QV4::F callData->argc = 0; callData->thisObject = Primitive::undefinedValue(); - strictMode = true; + strictMode = false; outer = function->scope(); activation = qml->d(); |