diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:32:15 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:32:15 +0100 |
| commit | fc5c77e371867cf6be8e270e452e21e5ac338283 (patch) | |
| tree | 2f4b355b44043d29ac8009caf2cf272603b2c026 /src/qml/jsruntime/qv4runtime.cpp | |
| parent | b160cd4eda1c2a8284f4eb0d10e715f98c8bda88 (diff) | |
| parent | 4e1463c20aa6ec52f23e1e5f6426b68edb2255f0 (diff) | |
Merge 5.8 into 5.8.0
Change-Id: I109ecd4511c5d6408e49b2f910c3f6253633ce4f
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 0a71f0000a..2026ecdfde 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -1259,7 +1259,7 @@ ReturnedValue Runtime::method_unwindException(ExecutionEngine *engine) * * Instead the push/pop pair acts as a non local scope. */ -void Runtime::method_pushWithScope(const Value &o, ExecutionEngine *engine) +void Runtime::method_pushWithScope(const Value &o, NoThrowEngine *engine) { engine->pushContext(engine->currentContext->newWithContext(o.toObject(engine))); Q_ASSERT(engine->jsStackTop == engine->currentContext + 2); @@ -1272,7 +1272,7 @@ void Runtime::method_pushCatchScope(NoThrowEngine *engine, int exceptionVarNameI Q_ASSERT(engine->jsStackTop == engine->currentContext + 2); } -void Runtime::method_popScope(ExecutionEngine *engine) +void Runtime::method_popScope(NoThrowEngine *engine) { Q_ASSERT(engine->jsStackTop == engine->currentContext + 2); engine->popContext(); |