diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-09-06 09:37:26 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-07 09:28:07 +0000 |
| commit | cb60409b308f57fb0e89b25062384c863822ff91 (patch) | |
| tree | a81bcdc80f42a0cb7271fe9a0261071db0be14b0 | |
| parent | 215dea1bfc113b792cb167e0359d36f9250e3d21 (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
Change-Id: I410101b7f13e60c0c2ed156a8cf5813c490d7bf0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit eff007aef95bfb71618ad3a7bd00481e5197c0f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 ccc90cabbf..b9f31ba2d5 100644 --- a/src/qml/qml/qqml.cpp +++ b/src/qml/qml/qqml.cpp @@ -916,7 +916,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); |