diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2022-09-26 17:45:56 +0200 |
---|---|---|
committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-09-27 02:50:24 +0200 |
commit | 24f68a0deb7aea19d9d80391a35c76043ed7532e (patch) | |
tree | 0b4d0437410f5f8a4347e9ce02c583e988160a94 /src/tools | |
parent | 5222df2be7d10bf44dfc2971774eadcb526b7a13 (diff) |
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 <alexandru.croitor@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/androiddeployqt/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |