From 39ae3ca68f1eba34386afb33fc0224701b56b8cc Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 22 Jul 2019 16:13:48 +0200
Subject: [PATCH] QbsProjectManager: Set qbs.architecture, not just
 qbs.architectures

If there's no multiplexing, then qbs.architectures will have no effect.

Task-number: QTCREATORBUG-22738
Change-Id: If485481bf0f683fc3c693216d13aee1ba87255fe
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 1444c3d98f7..3f8f5e84cb3 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -275,6 +275,8 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor
             ProjectExplorer::Abi::abiFromTargetTriplet(mainTc->originalTargetTriple())
             || targetAbi.osFlavor() == ProjectExplorer::Abi::AndroidLinuxFlavor) {
         data.insert(QLatin1String(QBS_ARCHITECTURE), architecture(mainTc->targetAbi()));
+    } else if (archs.count() == 1) {
+        data.insert(QLatin1String(QBS_ARCHITECTURE), archs.first());
     }
     data.insert(QLatin1String(QBS_TARGETPLATFORM), targetPlatform(targetAbi, k));