From f2cd2ac877686b44d1cbbc2188298f8aacee1839 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 12 Dec 2016 15:39:29 +0100 Subject: [PATCH] Qmake: Do not consider non C++ toolchains Do not consider non C++ toolchains when searching for a matching toolchain. Change-Id: I2b06fd677ec3b89d0c15290ba170344629ded20e Reviewed-by: Eike Ziller --- src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index a97ecc68add..9934bfb9286 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -79,9 +79,10 @@ void QmakeKitInformation::setup(Kit *k) ToolChain *tc = ToolChainKitInformation::toolChain(k, ToolChain::Language::Cxx); if (!tc || (!tc->suggestedMkspecList().empty() && !tc->suggestedMkspecList().contains(spec))) { - ToolChain *possibleTc = 0; + ToolChain *possibleTc = nullptr; foreach (ToolChain *current, ToolChainManager::toolChains()) { - if (version->qtAbis().contains(current->targetAbi())) { + if (current->language() == ToolChain::Language::Cxx + && version->qtAbis().contains(current->targetAbi())) { possibleTc = current; if (current->suggestedMkspecList().contains(spec)) break;