forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user