From 8751d46f971837fc2c1505d38ed7d050e16a7a69 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 16 Dec 2016 15:23:53 +0100 Subject: [PATCH] QbsProjectManager: Take the "no OS" case into account When a toolchain did not specify an operating system, we did not set qbs.targetOS, which meant it stayed at its default value (qbs.hostOS). Instead, we correctly set it to an empty list now. Task-number: QTCREATORBUG-17452 Change-Id: I2c7030013ea7a1f954e8d0f7059b471008a0ed72 Reviewed-by: Jake Petroules --- src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 0b5ce6d1c12..89bb848464b 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -218,9 +218,7 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor data.insert(QLatin1String(QBS_ARCHITECTURE), qbs::canonicalArchitecture(architecture)); } - QStringList targetOS = targetOSList(targetAbi, k); - if (!targetOS.isEmpty()) - data.insert(QLatin1String(QBS_TARGETOS), targetOS); + data.insert(QLatin1String(QBS_TARGETOS), targetOSList(targetAbi, k)); QStringList toolchain = toolchainList(mainTc);