feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Support generic Unix targets.

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2013-12-02 16:26:52 +01:00
committed by Tobias Hunger
parent 18d9d5b3f9
commit 97f5b31cc0
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -117,6 +117,17 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
<< QLatin1String("llvm") << QLatin1String("llvm")
<< QLatin1String("gcc")); << 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(); Utils::FileName cxx = tc->compilerCommand();
data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxx.toFileInfo().absolutePath()); data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxx.toFileInfo().absolutePath());