aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-10-06 15:45:05 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-10-08 18:54:29 +0200
commit04bc9d83f22a7266fb0caf53c2c3da0d9b06fef4 (patch)
tree883b9e3eba194efa05dbab3592fca8f1273b844b /tools
parente8007671d4ec6d791cb337b297f2beb7e5300929 (diff)
Allow optional imports in qmldir files
This is useful for modules that select their imports at runtime using qmlRegisterModuleImport(). We can list all possible variants as optional imports so that tools can see what types might be available. Task-number: QTBUG-87130 Change-Id: I8a37bdde79aef3619fd1f05e5ea6781d521afa88 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlimportscanner/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 5729c74855..70dec3ed96 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -191,7 +191,7 @@ QVariantMap pluginsForModulePath(const QString &modulePath, const QString &versi
const auto imports = parser.imports();
for (const auto &import : imports) {
- if (import.isAutoImport) {
+ if (import.flags & QQmlDirParser::Import::Auto) {
importsAndDependencies.append(
import.module + QLatin1Char(' ')
+ (version.isEmpty() ? QString::fromLatin1("auto") : version));