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

Fix correction of toolchain for cross compile

Browse Source 
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 <tobias.hunger@digia.com>
This commit is contained in:
Andreas Holzammer
2013-08-15 13:17:18 +02:00
committed by Tobias Hunger
parent 01123f6adb
commit 42da91e25c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qmakekitinformation.cpp
View File

@@ -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<ProjectExplorer::ToolChain *> tcList = ProjectExplorer::ToolChainManager::instance()->toolChains();
ProjectExplorer::ToolChain *possibleTc = 0;
foreach (ProjectExplorer::ToolChain *current, tcList) {