whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Android: print tailored warning if qml dependency path is a dir" 

This reverts commit c730a29260.

Reason for revert: The original change was wrong and caused
androiddeployqt to skip valid QML resource paths. 

Additionally, change log output from "file" to "path" when skipping
an import path.

Pick-to: 6.0 5.15
Fixes: QTBUG-89281
Change-Id: Ic338d147a04a03bb1d7acbede11b647ff036922a
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
bb10
Assam Boudjelthia 2020-12-09 14:12:45 +00:00 committed by Andy Shaw
parent b359fd6c2a
commit fa0dc83135
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1882,16 +1882,10 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
QFileInfo info(path);
if (info.isDir()) {
if (options->verbose)
fprintf(stdout, " -- Skipping because path is a directory.\n");
continue;
}
// The qmlimportscanner sometimes outputs paths that do not exist.
if (!info.exists()) {
if (options->verbose)
fprintf(stdout, " -- Skipping because file does not exist.\n");
fprintf(stdout, " -- Skipping because path does not exist.\n");
continue;
}
@ -1901,7 +1895,7 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
if (absolutePath.startsWith(rootPath)) {
if (options->verbose)
fprintf(stdout, " -- Skipping because file is in QML root path.\n");
fprintf(stdout, " -- Skipping because path is in QML root path.\n");
continue;
}