From 1e1253b5a7eec4cb9cbce514f8938d02c167c4cc Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 26 May 2017 16:53:09 +0300
Subject: [PATCH] ProjectExplorer: Fix language for previously auto-detected
 toolchains

Change-Id: I02138a07d45a2169b9d667a56fc88e3f11db942a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/projectexplorer/gcctoolchain.cpp | 7 ++++++-
 src/plugins/projectexplorer/toolchain.cpp    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index a190434efdf..36cab0f8ee5 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -972,8 +972,13 @@ QList<ToolChain *> GccToolChainFactory::autoDetectToolchains(const QString &comp
                                                return tc->typeId() == requiredTypeId
                                                    && tc->compilerCommand() == compilerPath;
                                            });
-    if (!result.isEmpty())
+    if (!result.isEmpty()) {
+        for (ToolChain *tc : result) {
+            if (tc->isAutoDetected())
+                tc->setLanguage(language);
+        }
         return result;
+    }
 
     result = autoDetectToolChain(compilerPath, language, requiredAbi);
 
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index cb636437046..53e03e16ad8 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -133,7 +133,7 @@ ToolChain::ToolChain(const ToolChain &other) :
 
 void ToolChain::setLanguage(Core::Id language)
 {
-    QTC_ASSERT(!d->m_language.isValid(), return);
+    QTC_ASSERT(!d->m_language.isValid() || isAutoDetected(), return);
     QTC_ASSERT(language.isValid(), return);
     QTC_ASSERT(ToolChainManager::isLanguageSupported(language), return);