From 90499d5a53a98b3374d876e2a7e2966278612002 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 20 May 2020 10:57:01 +0200
Subject: CompilationDbPM: Do not change the kit's toolchain

Amends 45d42d4518.

Fixes: QTCREATORBUG-24047
Change-Id: I115eaf06fb3c055069918d20f360bd027f15d680
Reviewed-by: hjk <hjk@qt.io>
---
 .../compilationdatabaseprojectmanager/compilationdatabaseproject.cpp    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 6dce6ed9fc..ee3c329141 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -202,7 +202,6 @@ RawProjectPart makeRawProjectPart(const Utils::FilePath &projectFile,
             kitInfo.cToolChain = toolchainFromFlags(kit,
                                                     originalFlags,
                                                     ProjectExplorer::Constants::C_LANGUAGE_ID);
-            ToolChainKitAspect::setToolChain(kit, kitInfo.cToolChain);
         }
         addDriverModeFlagIfNeeded(kitInfo.cToolChain, flags, originalFlags);
         rpp.setFlagsForC({kitInfo.cToolChain, flags});
@@ -211,7 +210,6 @@ RawProjectPart makeRawProjectPart(const Utils::FilePath &projectFile,
             kitInfo.cxxToolChain = toolchainFromFlags(kit,
                                                       originalFlags,
                                                       ProjectExplorer::Constants::CXX_LANGUAGE_ID);
-            ToolChainKitAspect::setToolChain(kit, kitInfo.cxxToolChain);
         }
         addDriverModeFlagIfNeeded(kitInfo.cxxToolChain, flags, originalFlags);
         rpp.setFlagsForCxx({kitInfo.cxxToolChain, flags});
-- 
cgit v1.2.3