Bring back captureRequired on scope/contest property loading

This is needed to properly register permanent/temporary dependencies

This patch also removes related interpreter instructions that should
have changed, but were not used.

Change-Id: Ie53c4611766680734c02e328b7f2c752cae150e0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 4cf543088e..52a6a9704c 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -184,18 +184,20 @@ 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 captureRequired) {
             Reference r(base.codegen, QmlScopeObject);
             r.base = base.asRValue();
             r.qmlCoreIndex = coreIndex;
             r.qmlNotifyIndex = notifyIndex;
+            r.captureRequired = captureRequired;
             return r;
         }
-        static Reference fromQmlContextObject(const Reference &base, qint16 coreIndex, qint16 notifyIndex) {
+        static Reference fromQmlContextObject(const Reference &base, qint16 coreIndex, qint16 notifyIndex, bool captureRequired) {
             Reference r(base.codegen, QmlContextObject);
             r.base = base.asRValue();
             r.qmlCoreIndex = coreIndex;
             r.qmlNotifyIndex = notifyIndex;
+            r.captureRequired = captureRequired;
             return r;
         }
         static Reference fromThis(Codegen *cg) {
@@ -234,6 +236,7 @@ public:
             struct { // QML scope/context object case
                 qint16 qmlCoreIndex;
                 qint16 qmlNotifyIndex;
+                bool captureRequired;
             };
         };
         mutable int tempIndex = -1;