From 4aa4811ed0a522e68bf326e37f3812b7156901e9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 25 Jun 2018 10:53:01 +0200 Subject: setup-android: Fix case where there is only one architecture There is no multiplexing in that case, so we have to set qbs.architecture instead of qbs.architectures. Change-Id: I2f96bfd6b67a6ef45882ba5ce9eb35ab2317e8b2 Reviewed-by: Joerg Bornemann --- src/app/qbs-setup-android/android-setup.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp index a2c3768c2..eb5ba92dd 100644 --- a/src/app/qbs-setup-android/android-setup.cpp +++ b/src/app/qbs-setup-android/android-setup.cpp @@ -197,8 +197,12 @@ static void setupNdk(qbs::Settings *settings, const QString &profileName, const mainProfile.setValue(qls("qbs.toolchain"), QStringList() << qls("gcc")); const QStringList archs = expectedArchs(); const QtInfoPerArch infoPerArch = getQtAndroidInfo(qtSdkDirPath); - mainProfile.setValue(qls("qbs.architectures"), infoPerArch.empty() - ? archs : QStringList(infoPerArch.keys())); + const QStringList archsForProfile = infoPerArch.empty() + ? archs : QStringList(infoPerArch.keys()); + if (archsForProfile.size() == 1) + mainProfile.setValue(qls("qbs.architecture"), archsForProfile.front()); + else + mainProfile.setValue(qls("qbs.architectures"), archsForProfile); QStringList searchPaths; QString platform; for (const QString &arch : archs) { -- cgit v1.2.3