diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-25 10:53:01 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-25 12:57:15 +0000 |
| commit | 4aa4811ed0a522e68bf326e37f3812b7156901e9 (patch) | |
| tree | 83661a6557595daf1f3e783cf785a6fb0b145fbf | |
| parent | 0259c67e630d0a39bc65dd85a5de3ba58180cb9d (diff) | |
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 <joerg.bornemann@qt.io>
| -rw-r--r-- | src/app/qbs-setup-android/android-setup.cpp | 8 |
1 files 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) { |