qmllint: Fix multiple attached property bugs

Fixes that inherited attached properties are not found.
Also fixes that unresolved attached properties were not detected as such by isResolved().

Fixes: QTBUG-93231
Change-Id: I8917721f1e578af22997d676457fe52b21041c51
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 7 insertions, 4 deletions

diff --git a/src/qmlcompiler/qqmljsscope_p.h b/src/qmlcompiler/qqmljsscope_p.h
index 2c6140b636..edca6bf0c3 100644
--- a/src/qmlcompiler/qqmljsscope_p.h
+++ b/src/qmlcompiler/qqmljsscope_p.h
@@ -246,15 +246,18 @@ public:
     bool hasPropertyBinding(const QString &name) const;
     QQmlJSMetaPropertyBinding propertyBinding(const QString &name) const;
 
-    bool isResolved() const { return m_baseTypeName.isEmpty() || !m_baseType.isNull(); }
+    bool isResolved() const;
     bool isFullyResolved() const;
 
     QString defaultPropertyName() const { return m_defaultPropertyName; }
     void setDefaultPropertyName(const QString &name) { m_defaultPropertyName = name; }
 
-    QString attachedTypeName() const { return m_attachedTypeName; }
-    void setAttachedTypeName(const QString &name) { m_attachedTypeName = name; }
-    QQmlJSScope::ConstPtr attachedType() const { return m_attachedType; }
+    QString ownAttachedTypeName() const { return m_attachedTypeName; }
+    void setOwnAttachedTypeName(const QString &name) { m_attachedTypeName = name; }
+    QQmlJSScope::ConstPtr ownAttachedType() const { return m_attachedType; }
+
+    QString attachedTypeName() const;
+    QQmlJSScope::ConstPtr attachedType() const;
 
     QString extensionTypeName() const { return m_extensionTypeName; }
     void setExtensionTypeName(const QString &name) { m_extensionTypeName =  name; }