From 3be61f0be9b2093ce834df7eb337cd0d16df4a60 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Thu, 27 Apr 2023 15:30:07 +0200
Subject: [PATCH] QmlDesigner: Activate kit after adding

We do not remove other targets anymore and instead activate
the added one.

Task-number: QDS-9652
Change-Id: I29d5b9e878b928611a1e854fd212682153b89d63
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/qmlprojectmanager/qmlproject.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 6743c136049..4e919005c08 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -120,8 +120,6 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro
     if (QmlProject::isQtDesignStudio()) {
         int preferedVersion = preferedQtTarget(activeTarget());
 
-        //        if (activeTarget())
-        //            removeTarget(activeTarget());
         setKitWithVersion(preferedVersion, kits);
     }
 
@@ -141,13 +139,19 @@ bool QmlProject::setKitWithVersion(const int qtMajorVersion, const QList<Kit *>
         return (version && version->qtVersion().majorVersion() == qtMajorVersion);
     });
 
+
+    Target *target = nullptr;
+
     if (!qtVersionkits.isEmpty()) {
         if (qtVersionkits.contains(KitManager::defaultKit()))
-            addTargetForDefaultKit();
+            target = addTargetForDefaultKit();
         else
-            addTargetForKit(qtVersionkits.first());
+            target = addTargetForKit(qtVersionkits.first());
     }
 
+    if (target)
+        SessionManager::setActiveTarget(this, target, SetActive::NoCascade);
+
     return true;
 }