summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-12-09 14:12:45 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-10 00:14:14 +0000
commitbc110c4e2f20a82ad718b14c2f4de1d9ab59cf4b (patch)
treeab8f897679add76a15f29d418710c474f8326008
parent98e7a6ae2cc1c44ef7ef801ad3149f7a49b3c8fc (diff)
Revert "Android: print tailored warning if qml dependency path is a dir"
This reverts commit c730a29260eda298683803bfd5306926696eedb0. 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. Fixes: QTBUG-89281 Change-Id: Ic338d147a04a03bb1d7acbede11b647ff036922a Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit fa0dc8313506b993ef0bd43ea5f38739cd58bcbd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/tools/androiddeployqt/main.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index b111cfba28..abd015b27f 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1798,16 +1798,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;
}
@@ -1817,7 +1811,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;
}