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

Qmake: Do not consider non C++ toolchains

Browse Source 
Do not consider non C++ toolchains when searching for a matching toolchain.

Change-Id: I2b06fd677ec3b89d0c15290ba170344629ded20e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-12 15:39:29 +01:00
parent 3840685998
commit f2cd2ac877
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,9 +79,10 @@ void QmakeKitInformation::setup(Kit *k)
ToolChain *tc = ToolChainKitInformation::toolChain(k, ToolChain::Language::Cxx); ToolChain *tc = ToolChainKitInformation::toolChain(k, ToolChain::Language::Cxx);
if (!tc || (!tc->suggestedMkspecList().empty() && !tc->suggestedMkspecList().contains(spec))) { if (!tc || (!tc->suggestedMkspecList().empty() && !tc->suggestedMkspecList().contains(spec))) {
ToolChain *possibleTc = 0; ToolChain *possibleTc = nullptr;
foreach (ToolChain *current, ToolChainManager::toolChains()) { foreach (ToolChain *current, ToolChainManager::toolChains()) {
if (version->qtAbis().contains(current->targetAbi())) { if (current->language() == ToolChain::Language::Cxx
&& version->qtAbis().contains(current->targetAbi())) {
possibleTc = current; possibleTc = current;
if (current->suggestedMkspecList().contains(spec)) if (current->suggestedMkspecList().contains(spec))
break; break;