From 24f68a0deb7aea19d9d80391a35c76043ed7532e Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 26 Sep 2022 17:45:56 +0200 Subject: Fix condition that runs the scanning of the Qml imports Scanning of the Qml imports should be run if either Qml root paths or .qrc files are specified for androiddeployqt. Task-number: QTBUG-106939 Pick-to: 6.2 6.4 Change-Id: I3229ec6d3f2ac17ef751b4a6ed74e8e98db7465e Reviewed-by: Alexandru Croitor Reviewed-by: Assam Boudjelthia --- src/tools/androiddeployqt/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools') diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index f9ba885a33..29df1ba2b1 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2295,7 +2295,7 @@ bool readDependencies(Options *options) } } - if ((!options->rootPaths.empty() || options->qrcFiles.isEmpty()) && + if ((!options->rootPaths.empty() || !options->qrcFiles.isEmpty()) && !scanImports(options, &usedDependencies)) return false; -- cgit v1.2.3