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

QtSupport: Relax ABI matching when fixing a Qt kit

Browse Source 
E.g. consider MSVC 2019 a candidate when filling in the toolchain in a
Qt kit that doesn't have one yet.

Task-number: QTCREATORBUG-23653
Change-Id: I90aeb6f80c8f95faafa1e345f51fde77ddd0d2bd
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-02 11:19:47 +01:00
parent 7dd8858fa2
commit 2ce03eae18
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qtsupport/qtkitinformation.cpp
View File

@@ -222,13 +222,25 @@ void QtKitAspect::fix(ProjectExplorer::Kit *k)
if (ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID)) if (ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID))
return; return;
const QString spec = version->mkspec(); const QString spec = version->mkspec();
const QList<ToolChain *> possibleTcs = ToolChainManager::toolChains( QList<ToolChain *> possibleTcs = ToolChainManager::toolChains(
[version](const ToolChain *t) { [version](const ToolChain *t) {
return t->isValid() return t->isValid()
&& t->language() == Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID) && t->language() == Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID)
&& version->qtAbis().contains(t->targetAbi()); && contains(version->qtAbis(), [t](const Abi &qtAbi) {
return qtAbi.isFullyCompatibleWith(t->targetAbi());
});
}); });
if (!possibleTcs.isEmpty()) { if (!possibleTcs.isEmpty()) {
// Prefer exact matches.
// TODO: We should probably prefer the compiler with the highest version number instead,
// but this information is currently not exposed by the ToolChain class.
sort(possibleTcs, [version](const ToolChain *tc1, const ToolChain *tc2) {
const QVector<Abi> &qtAbis = version->qtAbis();
const bool tc1ExactMatch = qtAbis.contains(tc1->targetAbi());
const bool tc2ExactMatch = qtAbis.contains(tc2->targetAbi());
return tc1ExactMatch && !tc2ExactMatch;
});
const QList<ToolChain *> goodTcs = Utils::filtered(possibleTcs, const QList<ToolChain *> goodTcs = Utils::filtered(possibleTcs,
[&spec](const ToolChain *t) { [&spec](const ToolChain *t) {
return t->suggestedMkspecList().contains(spec); return t->suggestedMkspecList().contains(spec);