1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

androiddeployqt: Do not misbehave on QML file and directory imports

Browse Source 
Those are generally not in any import path. So far, qmlimportscanner
generates invalid "path" entries for file and directory imports, causing
androiddeployqt to skip them early on. androiddeployqt should rather not
try to read them at all. Then we can fix qmlimportscanner.

Change-Id: Ic87a10bee5845a6b10ee902ba28aed5c060956f0
Task-number: QTBUG-126632
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 67ae983d1e9c75bf31d6fada0b667cfbe2f3fc0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ulf Hermann 2024-08-19 16:18:02 +02:00 committed by Qt Cherry-pick Bot
parent 6c3e5b08c4
commit 874de78012
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/androiddeployqt/main.cpp
View File

@ -2357,7 +2357,7 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
if (path.isEmpty()) {
fprintf(stderr, "Warning: QML import could not be resolved in any of the import paths: %s\n",
qPrintable(object.value("name"_L1).toString()));
} else {
} else if (object.value("type"_L1).toString() == "module"_L1) {
if (options->verbose)
fprintf(stdout, " -- Adding '%s' as QML dependency\n", qPrintable(path));
@ -2458,6 +2458,9 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
}
options->qtDependencies[options->currentArchitecture].append(qmlImportsDependencies);
} else {
// We don't need to handle file and directory imports. Generally those should be
// considered as part of the application and are therefore scanned separately.
}
}