TargetSetupPage: Prefer the default kit for the active target

Change-Id: Ia57685e7ffc5f9d45777731d24e5c8d218a4d5a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index a39b7c2413..204676bee6 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -698,12 +698,19 @@ bool TargetSetupPage::setupProject(Qt4ProjectManager::Qt4Project *project)
     // c) the first target
     ProjectExplorer::Target *activeTarget = 0;
     QList<ProjectExplorer::Target *> targets = project->targets();
+    int activeTargetPriority = 0;
     foreach (ProjectExplorer::Target *t, targets) {
         QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(t->kit());
-        if (version && version->type() == QLatin1String(QtSupport::Constants::SIMULATORQT))
+        if (t->kit() == ProjectExplorer::KitManager::instance()->defaultKit()) {
             activeTarget = t;
-        else if (!activeTarget && version && version->type() == QLatin1String(QtSupport::Constants::DESKTOPQT))
+            activeTargetPriority = 3;
+        } else if (activeTargetPriority < 2 && version && version->type() == QLatin1String(QtSupport::Constants::SIMULATORQT)) {
             activeTarget = t;
+            activeTargetPriority = 2;
+        } else if (activeTargetPriority < 1 && version && version->type() == QLatin1String(QtSupport::Constants::DESKTOPQT)) {
+            activeTarget = t;
+            activeTargetPriority = 1;
+        }
     }
     if (!activeTarget && !targets.isEmpty())
         activeTarget = targets.first();