From d27d2b5d72acb2a3be55d0af9ded4cd126a5f031 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 18 Nov 2020 16:35:20 +0100 Subject: QMetaProperty::typeName: use name from metatype Except for types marked as unresolved, we're doing it anyway - the only difference is that now we skip looking up the metatype by typeid. [ChangeLog][QMetaProperty][Important Behavior Change] QMetaProperty::typeName returns now always the same name as name() of the corresponding metatype. This can cause a change for enum properties which were not fully-qualified. Change-Id: I1f57743948b7262ac06095d3bbc838d620f6e481 Reviewed-by: Qt CI Bot Reviewed-by: Lars Knoll Reviewed-by: Ulf Hermann --- src/corelib/kernel/qmetaobject.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/corelib/kernel/qmetaobject.cpp') diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index aaf8142638..fe6b4075ef 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -2934,6 +2934,9 @@ const char *QMetaProperty::typeName() const { if (!mobj) return nullptr; + // TODO: can the metatype be invalid for dynamic metaobjects? + if (const auto mt = metaType(); mt.isValid()) + return mt.name(); return rawTypeNameFromTypeInfo(mobj, data.type()); } -- cgit v1.2.3