Commit 97f5b31c authored by Christian Kandeler's avatar Christian Kandeler Committed by Tobias Hunger

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: default avatarDenis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: default avatarTim Sander <tim@krieglstein.org>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 18d9d5b3
......@@ -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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment