diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-12-09 14:12:45 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-11 08:08:01 +0000 |
| commit | 6f0129d20571b742ef1aff72cb9d67320c86ac11 (patch) | |
| tree | 9813369d39936e5a3cabd6a91af853ecf7d2001f /src/tools | |
| parent | 0908175a1aafe9131c501c3a653ba7621e701f80 (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>
Diffstat (limited to 'src/tools')
| -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; } |