Improve selection of compiler when creating desktop kit

This is of special importance on Windows where every compiler
seems to be incompatible with every other.

Change-Id: I8a2c6122f1bc8e86bf23157f1ca1cd9e75b759b5
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.cpp b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
index 692e18ab75..7d1260807b 100644
--- a/src/plugins/qt4projectmanager/qmakekitinformation.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
@@ -98,13 +98,15 @@ void QmakeKitInformation::setup(ProjectExplorer::Kit *k)
 
     if (!tc || !tc->suggestedMkspecList().contains(spec)) {
         QList<ProjectExplorer::ToolChain *> tcList = ProjectExplorer::ToolChainManager::instance()->toolChains();
+        ProjectExplorer::ToolChain *possibleTc = 0;
         foreach (ProjectExplorer::ToolChain *current, tcList) {
-            if (version->qtAbis().contains(current->targetAbi())
-                    && current->suggestedMkspecList().contains(spec)) {
-                ProjectExplorer::ToolChainKitInformation::setToolChain(k, current);
-                break;
+            if (version->qtAbis().contains(current->targetAbi())) {
+                possibleTc = current;
+                if (current->suggestedMkspecList().contains(spec))
+                    break;
             }
         }
+        ProjectExplorer::ToolChainKitInformation::setToolChain(k, possibleTc);
     }
 }