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

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

Browse Source 
androiddeployqt might be misleading when the path is adir
and the warning says that the file does not exist.

Change-Id: I1129f49af58a0637a240fcfd425a61b2ed15c840
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit c730a29260eda298683803bfd5306926696eedb0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit fb984aaa1e8933cbe08820b9adf51eab3f1825d0)
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Assam Boudjelthia 2020-10-22 18:29:47 +03:00
parent 61829b5d39
commit e3e5a0476a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1882,6 +1882,12 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
QFileInfo info(path); 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. // The qmlimportscanner sometimes outputs paths that do not exist.
if (!info.exists()) { if (!info.exists()) {
if (options->verbose) if (options->verbose)