diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-11-28 09:31:10 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-19 16:30:19 +0100 |
commit | da2b7576daa58ad2881e41ad6f0f85ec55db4fd2 (patch) | |
tree | 1bb0dcfd7011f87aa1c238174205ce79c66273b6 /src/qml/jsruntime/qv4argumentsobject.cpp | |
parent | 45f77a6bfc05b97e6312a379c63840243b5815f3 (diff) |
Return Heap::ExecutionContext for currentContext()
Change-Id: I155ab996e24d7f36761d2ea62a04774e16469b34
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4argumentsobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4argumentsobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp index d283537292..eaca874d76 100644 --- a/src/qml/jsruntime/qv4argumentsobject.cpp +++ b/src/qml/jsruntime/qv4argumentsobject.cpp @@ -119,10 +119,10 @@ bool ArgumentsObject::defineOwnProperty(ExecutionEngine *engine, uint index, con pd->value = mappedArguments()->data[index]; } - bool strict = engine->currentContext()->d()->strictMode; - engine->currentContext()->d()->strictMode = false; + bool strict = engine->currentContext()->strictMode; + engine->currentContext()->strictMode = false; bool result = Object::defineOwnProperty2(scope.engine, index, desc, attrs); - engine->currentContext()->d()->strictMode = strict; + engine->currentContext()->strictMode = strict; if (isMapped && attrs.isData()) { Q_ASSERT(arrayData()); @@ -138,7 +138,7 @@ bool ArgumentsObject::defineOwnProperty(ExecutionEngine *engine, uint index, con } } - if (engine->currentContext()->d()->strictMode && !result) + if (engine->currentContext()->strictMode && !result) return engine->throwTypeError(); return result; } |