diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-12-10 11:05:12 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-12-12 20:25:17 +0100 |
| commit | 8028f871ae43d6da45b59f54243d4378f4c542af (patch) | |
| tree | 9876a6441ceac53d852ebbaa1f93f462954ad48c /src/qml/jsruntime | |
| parent | ea48b0e1293be99b88da7880052b7b9515ce4bcb (diff) | |
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 <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4qmlcontext.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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))); |