From e3e5a0476a4688046cd727d92481e18837507254 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 22 Oct 2020 18:29:47 +0300 Subject: [PATCH] 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 (cherry picked from commit c730a29260eda298683803bfd5306926696eedb0) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit fb984aaa1e8933cbe08820b9adf51eab3f1825d0) Reviewed-by: Andy Shaw --- src/tools/androiddeployqt/main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index f858cacf5cc..4c970f6cd01 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1882,6 +1882,12 @@ bool scanImports(Options *options, QSet *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)