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

ProjectExplorer: Tighten ABI check

Browse Source 
... when auto-detecting kits.
Take the entire ABI into account, including binary format and word
width.

Fixes: QTCREATORBUG-31119
Change-Id: I495faf3c54738750bddac65f5a1919144b9fecd4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2024-08-01 14:19:27 +02:00
parent 9926de01c1
commit 5a300a7fb7
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -157,12 +157,10 @@ static bool kitMatchesAbiList(const Kit *kit, const Abis &abis)
for (const Toolchain * const tc : toolchains) {
const Abi tcAbi = tc->targetAbi();
for (const Abi &abi : abis) {
if (tcAbi.os() == abi.os() && tcAbi.architecture() == abi.architecture()
&& (tcAbi.os() != Abi::LinuxOS || tcAbi.osFlavor() == abi.osFlavor())) {
if (tcAbi == abi)
return true;
}
}
}
return false;
};