From 42da91e25cd9430f32cac22cfa028182a84d5d33 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Thu, 15 Aug 2013 13:17:18 +0200 Subject: [PATCH] Fix correction of toolchain for cross compile For cross compile suggestedMkspecList is always empty, so dont try to autodetect a compiler then if toolchain was already found. Change-Id: I97d70e65fef3a5be0fdf20949c18cf98d51513d4 Reviewed-by: Tobias Hunger --- src/plugins/qt4projectmanager/qmakekitinformation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.cpp b/src/plugins/qt4projectmanager/qmakekitinformation.cpp index 94e212e1f2d..1ed1eed8a68 100644 --- a/src/plugins/qt4projectmanager/qmakekitinformation.cpp +++ b/src/plugins/qt4projectmanager/qmakekitinformation.cpp @@ -95,7 +95,7 @@ void QmakeKitInformation::setup(ProjectExplorer::Kit *k) ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k); - if (!tc || !tc->suggestedMkspecList().contains(spec)) { + if (!tc || (!tc->suggestedMkspecList().empty() && !tc->suggestedMkspecList().contains(spec))) { QList tcList = ProjectExplorer::ToolChainManager::instance()->toolChains(); ProjectExplorer::ToolChain *possibleTc = 0; foreach (ProjectExplorer::ToolChain *current, tcList) {