diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-12-09 11:22:52 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-12-13 11:51:13 +0000 |
| commit | 576fafd1e69429d7387e4c35f6d15fc42af6513e (patch) | |
| tree | 0e06903fea45ab0b8cc858756fd8fb0307cf0d32 /tools/qmlcachegen/qmlcachegen.cpp | |
| parent | 22f4306283d10e9aa5d6acb3e33ab2a8a397bb4c (diff) | |
Pass qmldir to qmlcachegen, qmllint and qmltc, not the qmltypes file
The tools will still grudgingly accept qmltypes files being passed via
the -i option. We generally expect qmldir files, though. Ignoring the
qmldir file and importing the qmltypes directly, ignores qmldir imports,
dependencies and other component entries. This leads to unresolvable
types.
[ChangeLog][QML Tooling] qmllint expects qmldir files, not qmltypes
files to be passed via the -i option now. This enables it to see the
imports and dependencies of the module being imported. For backwards
compatibility it still accepts qmltypes files, with a warning.
Pick-to: 6.3
Fixes: QTBUG-99043
Change-Id: I5ed32d7e78df1e604aaf1bfa2ebda09d5d57b628
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/qmlcachegen/qmlcachegen.cpp')
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index 3648a10f95..cca7abcfe0 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -112,8 +112,8 @@ int main(int argc, char **argv) parser.addOption(directCallsOption); QCommandLineOption importsOption( QStringLiteral("i"), - QCoreApplication::translate("main", "Import extra qmltypes"), - QCoreApplication::translate("main", "qmltypes file")); + QCoreApplication::translate("main", "Import extra qmldir"), + QCoreApplication::translate("main", "qmldir file")); parser.addOption(importsOption); QCommandLineOption importPathOption( QStringLiteral("I"), |