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

ProjectExplorer: Do not double check abi-s

Browse Source 
autoDetectToolChain already checks abi-s validity.
There's no need to do that again afterwards in
autoDetectToolchains.

Change-Id: I4f762ab2fd32e42a37abd5876da0dfe5e74643bf
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-08-06 11:41:28 +02:00
parent 344cbb3a1b
commit c24116f035
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1023,19 +1023,6 @@ QList<ToolChain *> GccToolChainFactory::autoDetectToolchains(const QString &comp
result = autoDetectToolChain(compilerPath, language, requiredAbi); result = autoDetectToolChain(compilerPath, language, requiredAbi);
if (!requiredAbi.isNull()) {
const Abi alternateAbi = Abi(requiredAbi.architecture(), requiredAbi.os(),
requiredAbi.osFlavor(), requiredAbi.binaryFormat(), 32);
ToolChain *abiTc = Utils::findOrDefault(result, [&requiredAbi, &alternateAbi](const ToolChain *tc) {
return requiredAbi == tc->targetAbi()
|| (requiredAbi.wordWidth() == 64 && tc->targetAbi() == alternateAbi);
});
if (!abiTc) {
qDeleteAll(result);
result.clear();
}
}
return result; return result;
} }