summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2023-04-27 15:30:07 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2023-04-27 14:10:33 +0000
commit6fd6fc7234c75e57f2dbdb4ee520acd79104eba1 (patch)
treeb50eb91800619cffe7d6675c194f2043f99115c6
parent333a818f11fd28522a1d7e2427c3faf954dbe538 (diff)
downloadqt-creator-6fd6fc7234c75e57f2dbdb4ee520acd79104eba1.tar.gz
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: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--src/plugins/qmlprojectmanager/qmlproject.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 6743c13604..4e919005c0 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;
}