summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-10-22 18:29:47 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-01 17:02:48 +0000
commitfb984aaa1e8933cbe08820b9adf51eab3f1825d0 (patch)
tree7d966a5fd1b984343374dcc5223378bb4ba18306
parent76671a57b5418ec98fe2c94a963728ac3306dc82 (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. 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>
-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 22facce703..b111cfba28 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1798,6 +1798,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)