From 6f0129d20571b742ef1aff72cb9d67320c86ac11 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 9 Dec 2020 14:12:45 +0000 Subject: [PATCH] Revert "Android: print tailored warning if qml dependency path is a dir" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit fa0dc8313506b993ef0bd43ea5f38739cd58bcbd) Reviewed-by: Qt Cherry-pick Bot --- src/tools/androiddeployqt/main.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 4c970f6cd01..3936c108b5b 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1882,16 +1882,10 @@ 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) - 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 *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; }