aboutsummaryrefslogtreecommitdiffstats
path: root/tools/shared
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-09-29 17:33:17 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-10-02 15:32:42 +0200
commite548c8576d1794cdac4b9a679b90cb74cf307e44 (patch)
treeb743c5c080032db37e3cc477c820eb78adcfe112 /tools/shared
parentd9e98c7f6b6c3331a486cabfe6cd0c07f7bfffe9 (diff)
qmllint: Don't use C++ names of QML types
The C++ names are an implementation detail of the importer, and qmllint has no business messing with them. All the types are supplied as ScopeTree by the importer now. Change-Id: I3ef2b5da1dc19f95c7f2a5d80fa1297ba10bef8f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/shared')
-rw-r--r--tools/shared/scopetree.cpp1
-rw-r--r--tools/shared/scopetree.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/shared/scopetree.cpp b/tools/shared/scopetree.cpp
index 0ead08aa10..ad950ffd70 100644
--- a/tools/shared/scopetree.cpp
+++ b/tools/shared/scopetree.cpp
@@ -155,6 +155,7 @@ void ScopeTree::resolveTypes(const QHash<QString, ScopeTree::Ptr> &contextualTyp
};
m_baseType = findType(m_baseTypeName);
+ m_attachedType = findType(m_attachedTypeName);
for (auto it = m_properties.begin(), end = m_properties.end(); it != end; ++it)
it->setType(findType(it->typeName()));
diff --git a/tools/shared/scopetree.h b/tools/shared/scopetree.h
index b4c241d561..df8dfcd2bc 100644
--- a/tools/shared/scopetree.h
+++ b/tools/shared/scopetree.h
@@ -165,6 +165,7 @@ public:
QString attachedTypeName() const { return m_attachedTypeName; }
void setAttachedTypeName(const QString &name) { m_attachedTypeName = name; }
+ ScopeTree::ConstPtr attachedType() const { return m_attachedType; }
bool isSingleton() const { return m_flags & Singleton; }
bool isCreatable() const { return m_flags & Creatable; }
@@ -235,6 +236,8 @@ private:
QString m_defaultPropertyName;
QString m_attachedTypeName;
+ ScopeTree::WeakPtr m_attachedType;
+
Flags m_flags;
AccessSemantics m_semantics = AccessSemantics::Reference;
};