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

Fix a crash when configured kit list is empty

Browse Source 
Task-number: QTCREATORBUG-17841
Change-Id: I73453c12d264961c6d766fbc58ceb1468104833c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jarek Kobus
2017-03-09 13:30:53 +01:00
committed by Tobias Hunger
parent db1e1db1e2
commit 1a5bdf14ad
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
View File

@@ -89,11 +89,13 @@ void QmakeKitInformation::setup(Kit *k)
&& t->language() == Core::Id(Constants::CXX_LANGUAGE_ID) && t->language() == Core::Id(Constants::CXX_LANGUAGE_ID)
&& version->qtAbis().contains(t->targetAbi()); && version->qtAbis().contains(t->targetAbi());
}); });
ToolChain *possibleTc if (!possibleTcs.isEmpty()) {
= Utils::findOr(possibleTcs, possibleTcs.last(), ToolChain *possibleTc
[&spec](const ToolChain *t) { return t->suggestedMkspecList().contains(spec); }); = Utils::findOr(possibleTcs, possibleTcs.last(),
if (possibleTc) [&spec](const ToolChain *t) { return t->suggestedMkspecList().contains(spec); });
ToolChainKitInformation::setToolChain(k, possibleTc); if (possibleTc)
ToolChainKitInformation::setToolChain(k, possibleTc);
}
} }
} }