aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmllint
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-09-25 13:29:50 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-09-25 16:16:21 +0200
commit0cc0c8535b17adc01525b6d309c3e38fd46d7917 (patch)
tree65c6cfb1ded6cfd7befcb60f9f5ffd4e86c0da96 /tools/qmllint
parent5458f379ac5d5d88dd7f5ddeafd370dbeee3a436 (diff)
QQmlDirParser: Treat dependencies like imports
In particular, allow auto and latest versions. Change-Id: I4a6b26112950d066ae2d8a37dc0e9fa1dec24724 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/qmllint')
-rw-r--r--tools/qmllint/findwarnings.cpp4
-rw-r--r--tools/qmllint/findwarnings.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmllint/findwarnings.cpp b/tools/qmllint/findwarnings.cpp
index 3caf72633a..997b8eda3a 100644
--- a/tools/qmllint/findwarnings.cpp
+++ b/tools/qmllint/findwarnings.cpp
@@ -100,7 +100,7 @@ FindWarningVisitor::Importer::Import FindWarningVisitor::Importer::readQmldir(co
Import result;
auto reader = createQmldirParserForFile(path + SlashQmldir);
result.imports.append(reader.imports());
- result.dependencies.append(reader.dependencies().values());
+ result.dependencies.append(reader.dependencies());
QHash<QString, ScopeTree::Ptr> qmlComponents;
const auto components = reader.components();
@@ -143,7 +143,7 @@ void FindWarningVisitor::Importer::processImport(
// QML code but the C++ types will be visible.
const QString invalidPrefix = QString::fromLatin1("$dependency$");
for (auto const &dependency : qAsConst(import.dependencies))
- importHelper(dependency.typeName, invalidPrefix, dependency.version);
+ importHelper(dependency.module, invalidPrefix, dependency.version);
for (auto const &import : qAsConst(import.imports)) {
importHelper(import.module, prefix,
diff --git a/tools/qmllint/findwarnings.h b/tools/qmllint/findwarnings.h
index edc4d46272..f16cff595c 100644
--- a/tools/qmllint/findwarnings.h
+++ b/tools/qmllint/findwarnings.h
@@ -84,7 +84,7 @@ private:
struct Import {
QHash<QString, ScopeTree::Ptr> objects;
QList<QQmlDirParser::Import> imports;
- QList<QQmlDirParser::Component> dependencies;
+ QList<QQmlDirParser::Import> dependencies;
QList<QPair<QString, ScopeTree::Ptr>> scripts;
};