aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-05-22 18:56:43 -0700
committerJake Petroules <jake.petroules@qt.io>2016-05-23 07:48:22 +0000
commite936ead98d58e3b54e0b3b3f89b93be2caa5206e (patch)
treea287a0f3d9f2f1f244e1a34a3fc3ba64fe64831d
parent6f7eecf318256eb43e8c2fe26f9438db683fa52e (diff)
Fix setup-toolchains when the compiler name is g++ and no --type is set.
Task-number: QBS-969 Change-Id: I0a2062415da31da02dd5e2013b377e90e8108278 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
-rw-r--r--src/app/qbs-setup-toolchains/probe.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index fb245c4eb..ea887b922 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -117,6 +117,8 @@ static QStringList toolchainTypeFromCompilerName(const QString &compilerName)
<< QLatin1String("mingw") << QLatin1String("gcc")))
if (compilerName.contains(type))
return completeToolchainList(type);
+ if (compilerName == QLatin1String("g++"))
+ return completeToolchainList(QLatin1String("gcc"));
return QStringList();
}