From 03f9b2ecf61ba3aace41e49b81b82eb58d94f1e7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 26 Jan 2023 13:18:52 +0100 Subject: [PATCH] QmlDesigner: Use simplfied type name to avoid ambiguities MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Types can be prefixed with QtQuick. or . Task-number: QDS-8947 Change-Id: If2b1423d6a08a9e083f6abeeca62be690ce20d3e Reviewed-by: Henning Gründl --- .../qmldesigner/designercore/metainfo/nodemetainfo.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index b61dff80a45..20ed84f54f0 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -2564,7 +2564,7 @@ bool NodeMetaInfo::isBool() const if (!isValid()) return false; - auto type = m_privateData->qualfiedTypeName(); + auto type = simplifiedTypeName(); return type == "bool" || type == "boolean"; } @@ -2579,7 +2579,7 @@ bool NodeMetaInfo::isInteger() const if (!isValid()) return false; - auto type = m_privateData->qualfiedTypeName(); + auto type = simplifiedTypeName(); return type == "int" || type == "integer"; } @@ -2597,7 +2597,7 @@ bool NodeMetaInfo::isFloat() const if (!isValid()) return false; - auto type = m_privateData->qualfiedTypeName(); + auto type = simplifiedTypeName(); return type == "qreal" || type == "double" || type == "float"; } @@ -2609,7 +2609,7 @@ bool NodeMetaInfo::isVariant() const using namespace Storage::Info; return isTypeId(m_typeId, m_projectStorage->builtinTypeId()); } else { - return isValid() && m_privateData->qualfiedTypeName() == "QVariant"; + return isValid() && simplifiedTypeName() == "QVariant"; } } @@ -2622,7 +2622,7 @@ bool NodeMetaInfo::isString() const if (!isValid()) return false; - auto type = m_privateData->qualfiedTypeName(); + auto type = simplifiedTypeName(); return type == "string" || type == "QString"; }