diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-12-09 14:12:45 +0000 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-12-09 20:01:13 +0000 |
| commit | fa0dc8313506b993ef0bd43ea5f38739cd58bcbd (patch) | |
| tree | 34cbdd1d64d68beb93bd5faa61c49668ab870fd7 /src | |
| parent | b359fd6c2a0b64ce3f4a942ec2ce9afd931b0933 (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.
Pick-to: 6.0 5.15
Fixes: QTBUG-89281
Change-Id: Ic338d147a04a03bb1d7acbede11b647ff036922a
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 4c970f6cd0..3936c108b5 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1882,16 +1882,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; } @@ -1901,7 +1895,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; } |