aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4codegen_p.h
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@qt.io>2017-06-30 10:33:37 +0200
committerLars Knoll <lars.knoll@qt.io>2017-06-30 08:57:14 +0000
commitb31ac3e4870ac73034e678fbdd8bca04de282dfc (patch)
tree3c30c389b75691c500383c15f998fb01607a1739 /src/qml/compiler/qv4codegen_p.h
parent6f1b4931d75993227def93c06935a933e8692f0b (diff)
Re-add missing captureRequired flag
Change-Id: I79b49655a55f98906723351ef7dd79099697bea1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4codegen_p.h')
-rw-r--r--src/qml/compiler/qv4codegen_p.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 36b65133e0..5a74b3cf54 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -326,18 +326,22 @@ public:
r.closureId = functionId;
return r;
}
- static Reference fromQmlScopeObject(const Reference &base, qint16 coreIndex, qint16 notifyIndex) {
+ static Reference fromQmlScopeObject(const Reference &base, qint16 coreIndex,
+ qint16 notifyIndex, bool requiresCapture) {
Reference r(base.codegen, QmlScopeObject);
r.base = base.asRValue();
r.qmlCoreIndex = coreIndex;
r.qmlNotifyIndex = notifyIndex;
+ r.requiresCapture = requiresCapture;
return r;
}
- static Reference fromQmlContextObject(const Reference &base, qint16 coreIndex, qint16 notifyIndex) {
+ static Reference fromQmlContextObject(const Reference &base, qint16 coreIndex,
+ qint16 notifyIndex, bool requiresCapture) {
Reference r(base.codegen, QmlContextObject);
r.base = base.asRValue();
r.qmlCoreIndex = coreIndex;
r.qmlNotifyIndex = notifyIndex;
+ r.requiresCapture = requiresCapture;
return r;
}
static Reference fromThis(Codegen *cg) {
@@ -373,9 +377,10 @@ public:
QV4::Moth::Param subscript;
QV4::ReturnedValue constant;
int closureId;
- struct {
+ struct { // QML scope/context object case
qint16 qmlCoreIndex;
qint16 qmlNotifyIndex;
+ bool requiresCapture;
};
};
mutable int tempIndex = -1;