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

QmlDesigner: Activate kit after adding

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2023-04-27 15:30:07 +02:00
parent 333a818f11
commit 6fd6fc7234
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

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