diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-07 15:24:42 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-08 08:26:06 +0200 |
| commit | 2bedff619c3775081bc5c8dfafa50fd7e11d8cb1 (patch) | |
| tree | 31266e294c3117bdb593bb3338d2aaeb0751e2fd /src/qml/qml/qqmlpropertyvalidator.cpp | |
| parent | 9a9ff0df09eecaaed577860025bf77e38824245f (diff) | |
Rename QQmlMetaType::metaObjectForMetaType into metaObjectForValueType
It really only works for value types and it's not intended to do
anythign else. The name should reflect this.
Change-Id: Ib73bf7e9655971f7826fe72145e2d2fab363363c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlpropertyvalidator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertyvalidator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 76a53e6737..deb747fa2f 100644 --- a/src/qml/qml/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp @@ -231,7 +231,7 @@ QVector<QQmlError> QQmlPropertyValidator::validateObject( if (binding->type >= QV4::CompiledData::Binding::Type_Object && (pd || binding->isAttachedProperty())) { const bool populatingValueTypeGroupProperty = pd - && QQmlMetaType::metaObjectForMetaType(pd->propType()) + && QQmlMetaType::metaObjectForValueType(pd->propType()) && !(binding->flags & QV4::CompiledData::Binding::IsOnAssignment); const QVector<QQmlError> subObjectValidatorErrors = validateObject(binding->value.objectIndex, binding, @@ -299,7 +299,7 @@ QVector<QQmlError> QQmlPropertyValidator::validateObject( return recordError(bindingError); } else if (binding->isGroupProperty()) { if (QQmlMetaType::isValueType(pd->propType())) { - if (QQmlMetaType::metaObjectForMetaType(pd->propType())) { + if (QQmlMetaType::metaObjectForValueType(pd->propType())) { if (!pd->isWritable()) { return recordError(binding->location, tr("Invalid property assignment: \"%1\" is a read-only property").arg(name)); } |