diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-24 01:01:06 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-24 15:43:53 +0200 |
| commit | e99469da2d99e1877276f7b37e5e8d699d8b14ee (patch) | |
| tree | 87167f1f4cc8e1b851097052e60edbaae32e00af /src/qml/jsruntime/qv4stackframe_p.h | |
| parent | fbe32d83b3e16bc51866daf5635cd36e1f70753b (diff) | |
| parent | 328b97a0acdf294f6ba3c902d23ece374a0f11ba (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/qml/jsruntime/qv4stackframe_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4stackframe_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4stackframe_p.h b/src/qml/jsruntime/qv4stackframe_p.h index bf689a74bc..616fa9a5a9 100644 --- a/src/qml/jsruntime/qv4stackframe_p.h +++ b/src/qml/jsruntime/qv4stackframe_p.h @@ -117,7 +117,7 @@ struct Q_QML_EXPORT CppStackFrame { void setupJSFrame(Value *stackSpace, const Value &function, const Heap::ExecutionContext *scope, const Value &thisObject, const Value &newTarget = Value::undefinedValue()) { setupJSFrame(stackSpace, function, scope, thisObject, newTarget, - v4Function->nFormals, v4Function->compiledFunction->nRegisters); + v4Function->compiledFunction->nFormals, v4Function->compiledFunction->nRegisters); } void setupJSFrame(Value *stackSpace, const Value &function, const Heap::ExecutionContext *scope, const Value &thisObject, const Value &newTarget, uint nFormals, uint nRegisters) |