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

GccToolchain: Also handle compilers named cc and c++

Browse Source 
This fixes a common cause for duplicate kits during import: The
projects are configured to use one of these compilers, Creator says
it can't support them, resulting in a kit without a ToolChain.

This in turn will fail the comparison between temporary kits, so
the same kit will get created twice.

Right after the kit gets created, it gets fixed up again, so the kit
seems very sensible after the import is done.

Task-number: QTCREATORBUG-22702
Task-number: QTCREATORBUG-20582
Change-Id: I19c8f2e1131818dd9ab86c656001893ec3c083bf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2020-07-02 13:09:09 +02:00
parent b077a4b845
commit 195690973e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -1075,9 +1075,11 @@ QList<ToolChain *> GccToolChainFactory::detectForImport(const ToolChainDescripti
{ {
const QString fileName = tcd.compilerPath.toFileInfo().completeBaseName(); const QString fileName = tcd.compilerPath.toFileInfo().completeBaseName();
if ((tcd.language == Constants::C_LANGUAGE_ID && (fileName.startsWith("gcc") if ((tcd.language == Constants::C_LANGUAGE_ID && (fileName.startsWith("gcc")
|| fileName.endsWith("gcc"))) || fileName.endsWith("gcc")
|| fileName == "cc"))
|| (tcd.language == Constants::CXX_LANGUAGE_ID && (fileName.startsWith("g++") || (tcd.language == Constants::CXX_LANGUAGE_ID && (fileName.startsWith("g++")
|| fileName.endsWith("g++")))) || fileName.endsWith("g++")
|| fileName == "c++")))
return autoDetectToolChain(tcd, [](const ToolChain *tc) { return autoDetectToolChain(tcd, [](const ToolChain *tc) {
return tc->targetAbi().osFlavor() != Abi::WindowsMSysFlavor; return tc->targetAbi().osFlavor() != Abi::WindowsMSysFlavor;
}); });