diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-09-06 09:37:26 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-09-06 11:03:09 +0200 |
| commit | eff007aef95bfb71618ad3a7bd00481e5197c0f3 (patch) | |
| tree | 4bd7973d48523747ce386eae7cd5ba7d011a8585 /src/qml/qml/qqml.cpp | |
| parent | 9e62b6a355b415db9b99ddfb2459fc0914d63a93 (diff) | |
Check setter == setLookup when retrieving lookup metatype
We want the same init/apply mechanics to also work with setObjectLookup,
and for that we need lookupResultMetaType to do the same thing there.
Task-number: QTBUG-96144
Pick-to: 6.2
Change-Id: I410101b7f13e60c0c2ed156a8cf5813c490d7bf0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqml.cpp')
| -rw-r--r-- | src/qml/qml/qqml.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp index c23293c708..e8561b230d 100644 --- a/src/qml/qml/qqml.cpp +++ b/src/qml/qml/qqml.cpp @@ -949,7 +949,8 @@ QMetaType AOTCompiledContext::lookupResultMetaType(uint index) const if (l->qmlContextPropertyGetter == QV4::QQmlContextWrapper::lookupScopeObjectProperty || l->qmlContextPropertyGetter == QV4::QQmlContextWrapper::lookupContextObjectProperty || l->getter == QV4::QQmlTypeWrapper::lookupSingletonProperty - || l->getter == QV4::QObjectWrapper::lookupGetter) { + || l->getter == QV4::QObjectWrapper::lookupGetter + || l->setter == QV4::QObjectWrapper::lookupSetter) { return l->qobjectLookup.propertyData->propType(); } else if (l->getter == QV4::QQmlValueTypeWrapper::lookupGetter) { return QMetaType(l->qgadgetLookup.metaType); |