Only register QML dependencies for reads from scope/context props

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

1 files changed, 2 insertions, 16 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 6aa57a6390..d03e2ad539 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -2030,30 +2030,16 @@ QQmlJS::Codegen::Reference JSCodeGen::fallbackNameLookup(const QString &name)
         QQmlPropertyData *data = lookupQmlCompliantProperty(_scopeObject, name);
         if (!data)
             return Reference::fromName(this, name);
-#if 0
-        QV4::IR::Temp *base = _block->TEMP(_qmlContextTemp);
-        base->memberResolver = _function->New<QV4::IR::MemberExpressionResolver>();
-        base->memberResolver->owner = _function;
-        initMetaObjectResolver(base->memberResolver, _scopeObject);
-#endif
-        _function->scopeObjectPropertyDependencies.insert(data->coreIndex(), data->notifyIndex());
         Reference base = Reference::fromTemp(this, _qmlContextTemp);
-        return Reference::fromQmlScopeObject(base, data->coreIndex());
+        return Reference::fromQmlScopeObject(base, data->coreIndex(), data->notifyIndex());
     }
 
     if (_contextObject) {
         QQmlPropertyData *data = lookupQmlCompliantProperty(_contextObject, name);
         if (!data)
             return Reference::fromName(this, name);
-#if 0
-        QV4::IR::Temp *base = _block->TEMP(_qmlContextTemp);
-        base->memberResolver = _function->New<QV4::IR::MemberExpressionResolver>();
-        base->memberResolver->owner = _function;
-        initMetaObjectResolver(base->memberResolver, _contextObject);
-#endif
-        _function->contextObjectPropertyDependencies.insert(data->coreIndex(), data->notifyIndex());
         Reference base = Reference::fromTemp(this, _qmlContextTemp);
-        return Reference::fromQmlContextObject(base, data->coreIndex());
+        return Reference::fromQmlContextObject(base, data->coreIndex(), data->notifyIndex());
     }
 #else
     Q_UNUSED(name)