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/qv4regexpobject.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/qv4regexpobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4regexpobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index ff78cf3e13..6a1d86522d 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -246,8 +246,8 @@ void Heap::RegExpCtor::clearLastMatch() ReturnedValue RegExpCtor::construct(Managed *m, CallData *callData) { - ExecutionContext *ctx = m->engine()->currentContext(); - Scope scope(ctx); + Scope scope(m->engine()); + ScopedContext ctx(scope, scope.engine->currentContext()); ScopedValue r(scope, callData->argument(0)); ScopedValue f(scope, callData->argument(1)); |