summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-10-22 18:29:47 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-12-01 15:13:10 +0200
commitc730a29260eda298683803bfd5306926696eedb0 (patch)
treea3df854b62bbedb317256f059f6cad77c224eb39 /src/tools
parent27dbb3ee5477dbfed5fa96a688683744e13cc9cb (diff)
Android: print tailored warning if qml dependency path is a dir
androiddeployqt might be misleading when the path is adir and the warning says that the file does not exist. Pick-to: 5.15 Change-Id: I1129f49af58a0637a240fcfd425a61b2ed15c840 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/androiddeployqt/main.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index f858cacf5c..4c970f6cd0 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1882,6 +1882,12 @@ 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)