summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Buhr <andreas.buhr@qt.io>2021-10-01 09:41:40 +0200
committerAndreas Buhr <andreas.buhr@qt.io>2021-10-04 12:04:16 +0200
commit1405c1d5bf91c85d4cb8fcdd6d91f7af19690126 (patch)
treea750a3bdb89cc6f16a76c141d5c16d6cde125e57
parenta8823db57839f0a690f1cd488e2a268871aeca68 (diff)
androiddeployqt: only write enabled architectures to build.gradle
androiddeployqt writes a list of architectures into the build.gradle file. This list should only contain the architectures which are enabled. This patch adapts the generation of this list accordingly. Amends 07cfab07a2a489e021b56226824a2d9b1211fad7. Change-Id: I5c7c1886c54cc3b9a7e42af6eefbaf2a067a67d5 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
-rw-r--r--src/tools/androiddeployqt/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 57f51ba1bd..7f09d32cef 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -2628,6 +2628,8 @@ bool buildAndroidProject(const Options &options)
gradleProperties["androidBuildToolsVersion"] = options.sdkBuildToolsVersion.toLocal8Bit();
QString abiList;
for (auto it = options.architectures.constBegin(); it != options.architectures.constEnd(); ++it) {
+ if (!it->enabled)
+ continue;
if (abiList.size())
abiList.append(u",");
abiList.append(it.key());