feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CompilationDbPM: Do not change the kit's toolchain

Browse Source 
Amends 45d42d4518.

Fixes: QTCREATORBUG-24047
Change-Id: I115eaf06fb3c055069918d20f360bd027f15d680
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-05-20 10:57:01 +02:00
parent 99dde07495
commit 90499d5a53
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
View File

@@ -202,7 +202,6 @@ RawProjectPart makeRawProjectPart(const Utils::FilePath &projectFile,
kitInfo.cToolChain = toolchainFromFlags(kit, kitInfo.cToolChain = toolchainFromFlags(kit,
originalFlags, originalFlags,
ProjectExplorer::Constants::C_LANGUAGE_ID); ProjectExplorer::Constants::C_LANGUAGE_ID);
ToolChainKitAspect::setToolChain(kit, kitInfo.cToolChain);
} }
addDriverModeFlagIfNeeded(kitInfo.cToolChain, flags, originalFlags); addDriverModeFlagIfNeeded(kitInfo.cToolChain, flags, originalFlags);
rpp.setFlagsForC({kitInfo.cToolChain, flags}); rpp.setFlagsForC({kitInfo.cToolChain, flags});
@@ -211,7 +210,6 @@ RawProjectPart makeRawProjectPart(const Utils::FilePath &projectFile,
kitInfo.cxxToolChain = toolchainFromFlags(kit, kitInfo.cxxToolChain = toolchainFromFlags(kit,
originalFlags, originalFlags,
ProjectExplorer::Constants::CXX_LANGUAGE_ID); ProjectExplorer::Constants::CXX_LANGUAGE_ID);
ToolChainKitAspect::setToolChain(kit, kitInfo.cxxToolChain);
} }
addDriverModeFlagIfNeeded(kitInfo.cxxToolChain, flags, originalFlags); addDriverModeFlagIfNeeded(kitInfo.cxxToolChain, flags, originalFlags);
rpp.setFlagsForCxx({kitInfo.cxxToolChain, flags}); rpp.setFlagsForCxx({kitInfo.cxxToolChain, flags});