From 8028f871ae43d6da45b59f54243d4378f4c542af Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 10 Dec 2021 11:05:12 +0100 Subject: Revert accidental change in qv4qmlcontext.cpp Amends commit 90790ef23bb148b4ac4c055bd3c11153b4c9a502. As detailed in the commit message of that change, we don't know if it's actually safe to skip the work if we've already set up the lookup before. We should indeed overwrite it. Pick-to: 6.2 Change-Id: I27cc4dd256599c292f748b2b70cc2519baabb32c Reviewed-by: Fabian Kosmale --- src/qml/jsruntime/qv4qmlcontext.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/qml/jsruntime') diff --git a/src/qml/jsruntime/qv4qmlcontext.cpp b/src/qml/jsruntime/qv4qmlcontext.cpp index 95a6d64d47..c9a9ab138a 100644 --- a/src/qml/jsruntime/qv4qmlcontext.cpp +++ b/src/qml/jsruntime/qv4qmlcontext.cpp @@ -305,8 +305,7 @@ ReturnedValue QQmlContextWrapper::getPropertyAndBase(const QQmlContextWrapper *r if (base) *base = QV4::QObjectWrapper::wrap(v4, scopeObject); - if (lookup && propertyData && lookup->qmlContextPropertyGetter - != QQmlContextWrapper::lookupScopeObjectProperty) { + if (lookup && propertyData) { QQmlData *ddata = QQmlData::get(scopeObject, false); if (ddata && ddata->propertyCache) { ScopedValue val(scope, base ? *base : Value::fromReturnedValue(QV4::QObjectWrapper::wrap(v4, scopeObject))); -- cgit v1.2.3