From adf0f541e506eb86597317a7694b83790cdea457 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 10 Nov 2021 11:38:46 +0100 Subject: [PATCH] QQmlJSTypeResolver: Don't store the importer We only need it to extract the builtins at construction time. Change-Id: I5269dea2ad1afc0a793c2b8e92d0bb507647afce Reviewed-by: Andrei Golubev Reviewed-by: Fabian Kosmale --- src/qmlcompiler/qqmljstyperesolver.cpp | 3 +-- src/qmlcompiler/qqmljstyperesolver_p.h | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qmlcompiler/qqmljstyperesolver.cpp b/src/qmlcompiler/qqmljstyperesolver.cpp index 5b9c6bf356..aabde09dc6 100644 --- a/src/qmlcompiler/qqmljstyperesolver.cpp +++ b/src/qmlcompiler/qqmljstyperesolver.cpp @@ -67,8 +67,7 @@ static bool searchBaseAndExtensionTypes(const QQmlJSScope::ConstPtr type, const QQmlJSTypeResolver::QQmlJSTypeResolver(QQmlJSImporter *importer, const QmlIR::Document *document, TypeStorage storage, Semantics semantics, QQmlJSLogger *logger) - : m_importer(importer) - , m_document(document) + : m_document(document) , m_typeStorage(storage) , m_semantics(semantics) , m_parentMode(semantics == Static ? UseDocumentParent : UseParentProperty) diff --git a/src/qmlcompiler/qqmljstyperesolver_p.h b/src/qmlcompiler/qqmljstyperesolver_p.h index 9ca4e50b3a..a6ddc9445e 100644 --- a/src/qmlcompiler/qqmljstyperesolver_p.h +++ b/src/qmlcompiler/qqmljstyperesolver_p.h @@ -86,8 +86,6 @@ public: QQmlJSScope::ConstPtr metaObjectType() const { return m_metaObjectType; } QQmlJSScope::ConstPtr jsGlobalObject() const { return m_jsGlobalObject; } - QQmlJSImporter *importer() const { return m_importer; } - QQmlJSScope::ConstPtr scopeForLocation(const QV4::CompiledData::Location &location) const; QQmlJSScope::ConstPtr scopeForId(const QString &id) const; @@ -175,7 +173,6 @@ protected: QQmlJSScope::ConstPtr m_metaObjectType; QQmlJSScope::ConstPtr m_jsGlobalObject; - QQmlJSImporter *m_importer = nullptr; const QmlIR::Document *m_document = nullptr; QHash m_objectsById;