From 97f5b31cc0ab13c200eb1ba1369185827abb357c Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Mon, 2 Dec 2013 16:26:52 +0100
Subject: [PATCH] QbsProjectManager: Support generic Unix targets.
The profiles that we currently create do not work with any non-Linux,
non-Mac Unix system.
Note: This patch introduces some additional redundancy to keep the risk
close to zero. Clean-up can be done later in a non-frozen branch.
Task-number: QTCREATORBUG-10968
Change-Id: I4e150d641a726826b8f3bae4b4a25d80c51f08c9
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
.../qbsprojectmanager/defaultpropertyprovider.cpp | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 853227da67a..b8d8adb2f7b 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -117,6 +117,17 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
<< QLatin1String("llvm")
<< QLatin1String("gcc"));
}
+ } else {
+ // TODO: Factor out toolchain type setting.
+ data.insert(QLatin1String(QBS_TARGETOS), QStringList() << 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"));
+ }
}
Utils::FileName cxx = tc->compilerCommand();
data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxx.toFileInfo().absolutePath());
--
GitLab