From 273dfa32e21423ea70fdf1b987714efe7e102cc4 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 26 Jun 2013 17:51:44 +0200 Subject: [PATCH] Adapt Qbs profile generation to recent changes in Qbs * targetOS for mac is "osx" * targetOS and toolchain are lists Change-Id: I53d6c0d3669570c5c35f42a358727128d4d9d827 Reviewed-by: Christian Kandeler --- .../qbsprojectmanager/qbsprojectmanager.cpp | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index ae607ac5e0f..57b7d5d69ad 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -252,13 +252,23 @@ void QbsManager::addProfileFromKit(const ProjectExplorer::Kit *k) if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) { data.insert(QLatin1String(QBS_TARGETOS), QLatin1String("windows")); data.insert(QLatin1String(QBS_TOOLCHAIN), - targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor ? - QLatin1String("mingw") : QLatin1String("msvc")); + targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor + ? QStringList() << QLatin1String("mingw") << QLatin1String("gcc") + : QStringList() << QLatin1String("msvc")); } else if (targetAbi.os() == ProjectExplorer::Abi::MacOS) { - data.insert(QLatin1String(QBS_TARGETOS), QLatin1String("mac")); - data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc")); + data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("osx") + << QLatin1String("darwin") << QLatin1String("unix")); + if (tc->type() != QLatin1String("clang")) { + data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc")); + } else { + data.insert(QLatin1String(QBS_TOOLCHAIN), + QStringList() << QLatin1String("clang") + << QLatin1String("llvm") + << QLatin1String("gcc")); + } } else if (targetAbi.os() == ProjectExplorer::Abi::LinuxOS) { - data.insert(QLatin1String(QBS_TARGETOS), QLatin1String("linux")); + data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("linux") + << QLatin1String("unix")); if (tc->type() != QLatin1String("clang")) { data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc")); } else {