diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-21 14:11:10 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-22 09:57:57 +0200 |
| commit | 826b7c3b18b2104cd0ff2c4b90892e72e149a88d (patch) | |
| tree | ec337d2708e9944216b62c3c002c3765ed1dfa6f /src/qmlcompiler/qqmljsimportvisitor_p.h | |
| parent | ec9d125f553c073ec7a431114a568eaeb6534b63 (diff) | |
qmllint: Resolve aliases in nested objects
So far we've just ignored them.
Change-Id: I2ca522ef825a341a3f4bf1c2a42fb0376180cdda
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljsimportvisitor_p.h')
| -rw-r--r-- | src/qmlcompiler/qqmljsimportvisitor_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qmlcompiler/qqmljsimportvisitor_p.h b/src/qmlcompiler/qqmljsimportvisitor_p.h index 0255450c68..eef5889263 100644 --- a/src/qmlcompiler/qqmljsimportvisitor_p.h +++ b/src/qmlcompiler/qqmljsimportvisitor_p.h @@ -59,6 +59,7 @@ public: protected: bool visit(QQmlJS::AST::UiProgram *) override; + void endVisit(QQmlJS::AST::UiProgram *) override; bool visit(QQmlJS::AST::UiObjectDefinition *) override; void endVisit(QQmlJS::AST::UiObjectDefinition *) override; bool visit(QQmlJS::AST::UiPublicMember *) override; @@ -97,7 +98,7 @@ protected: QString m_implicitImportDirectory; QStringList m_qmltypesFiles; QQmlJSScope::Ptr m_currentScope; - QQmlJSScope::ConstPtr m_qmlRootScope; + QQmlJSScope::Ptr m_qmlRootScope; QQmlJSScope::ConstPtr m_globalScope; QHash<QString, QQmlJSScope::ConstPtr> m_scopesById; QHash<QString, QQmlJSScope::ConstPtr> m_rootScopeImports; @@ -110,6 +111,7 @@ protected: void leaveEnvironment(); private: + void resolveAliases(); void visitFunctionExpressionHelper(QQmlJS::AST::FunctionExpression *fexpr); void importExportedNames(QQmlJSScope::ConstPtr scope); }; |