From 2bedff619c3775081bc5c8dfafa50fd7e11d8cb1 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 7 Jun 2021 15:24:42 +0200 Subject: 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 --- src/qml/qml/qqmlpropertyvalidator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/qml/qqmlpropertyvalidator.cpp') 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 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 subObjectValidatorErrors = validateObject(binding->value.objectIndex, binding, @@ -299,7 +299,7 @@ QVector 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)); } -- cgit v1.2.3