From bcbf0d84179421706b07578b541ff50c3dfdfe62 Mon Sep 17 00:00:00 2001
From: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Date: Thu, 16 Apr 2015 00:24:06 +0300
Subject: [PATCH] Fix toolchain detection when C compiler specified

If someone specifies C compiler instead of C++ one, then
extractToolchainPrefix() returns an empty result which
causes invalid behaiour on build stage.

Task-number: QTCREATORBUG-14250
Change-Id: I94d2a281c6a98178c486019344c6cdc71ac50a49
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
 src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 97a82d9c59b..9fb3877e21f 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -62,7 +62,9 @@ static QString extractToolchainPrefix(QString *compilerName)
 {
     QString prefix;
     if (compilerName->endsWith(QLatin1String("-g++"))
-            || compilerName->endsWith(QLatin1String("-clang++"))) {
+            || compilerName->endsWith(QLatin1String("-clang++"))
+            || compilerName->endsWith(QLatin1String("-gcc"))
+            || compilerName->endsWith(QLatin1String("-clang"))) {
         const int idx = compilerName->lastIndexOf(QLatin1Char('-')) + 1;
         prefix = compilerName->left(idx);
         compilerName->remove(0, idx);