aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-02-19 13:29:09 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-02-19 13:08:35 +0000
commitb7708daac26875aa251e5d7f8567f51f76450448 (patch)
treebf4f464f0980a51b4571d992d630e0c841c33d7c
parent20608d7fd8d9216f0a1d2204316fcb4f1a3c7229 (diff)
bare-metal: Don't set the IAR's qbs.architecture if it is empty
Change-Id: Id8467f8bb703ffc98b0f77cd390a7e8a22961ac8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/app/qbs-setup-toolchains/probe.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 2195106a1..97ba4e0cc 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -275,7 +275,8 @@ static Profile createIarProfile(const QFileInfo &compiler, Settings *settings,
Profile profile(profileName, settings);
profile.setValue(QLatin1String("cpp.toolchainInstallPath"), compiler.absolutePath());
profile.setValue(QLatin1String("qbs.toolchainType"), QLatin1String("iar"));
- profile.setValue(QLatin1String("qbs.architecture"), architecture);
+ if (!architecture.isEmpty())
+ profile.setValue(QLatin1String("qbs.architecture"), architecture);
qStdout << Tr::tr("Profile '%1' created for '%2'.").arg(
profile.name(), compiler.absoluteFilePath())