aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/corelib/tools/toolchains.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/corelib/tools/toolchains.cpp b/src/lib/corelib/tools/toolchains.cpp
index 0d793f8aa..6263fb199 100644
--- a/src/lib/corelib/tools/toolchains.cpp
+++ b/src/lib/corelib/tools/toolchains.cpp
@@ -49,9 +49,11 @@ namespace qbs {
namespace Internal {
static const QString clangToolchain() { return QStringLiteral("clang"); }
+static const QString clangClToolchain() { return QStringLiteral("clang-cl"); }
static const QString gccToolchain() { return QStringLiteral("gcc"); }
static const QString llvmToolchain() { return QStringLiteral("llvm"); }
static const QString mingwToolchain() { return QStringLiteral("mingw"); }
+static const QString msvcToolchain() { return QStringLiteral("msvc"); }
}
using namespace Internal;
@@ -64,7 +66,8 @@ QStringList canonicalToolchain(const QStringList &toolchain)
llvmToolchain(),
mingwToolchain(),
gccToolchain(),
- QStringLiteral("msvc")
+ clangClToolchain(),
+ msvcToolchain()
};
// Canonicalize each toolchain in the toolchain list,
@@ -110,6 +113,8 @@ QStringList canonicalToolchain(const QString &name)
else if (toolchainName == llvmToolchain() ||
toolchainName == mingwToolchain()) {
toolchains << canonicalToolchain(QStringLiteral("gcc"));
+ } else if (toolchainName == clangClToolchain()) {
+ toolchains << canonicalToolchain(msvcToolchain());
}
return toolchains;
}