From 15639d00edf5cdc26d8ef2c784219af95ec6b6c5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 20 Oct 2021 14:42:25 +0200 Subject: [PATCH] ProjectExplorer: Prevent cascading "Replacement for" kit names Fixes: QTCREATORBUG-26330 Change-Id: Id7abd00afb70fe2d2e3c1a43e2ea1298c0ff20cc Reviewed-by: David Schulz --- src/plugins/projectexplorer/project.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 38cdf161713..b283862c467 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -805,8 +805,9 @@ void Project::createTargetFromMap(const QVariantMap &map, int index) deviceTypeId = Constants::DESKTOP_DEVICE_TYPE; const QString formerKitName = targetMap.value(Target::displayNameKey()).toString(); k = KitManager::registerKit([deviceTypeId, &formerKitName](Kit *kit) { - const QString tempKitName = makeUniquelyNumbered( - tr("Replacement for \"%1\"").arg(formerKitName), + const QString kitNameSuggestion = formerKitName.contains(tr("Replacement for")) + ? formerKitName : tr("Replacement for \"%1\"").arg(formerKitName); + const QString tempKitName = makeUniquelyNumbered(kitNameSuggestion, transform(KitManager::kits(), &Kit::unexpandedDisplayName)); kit->setUnexpandedDisplayName(tempKitName); DeviceTypeKitAspect::setDeviceTypeId(kit, deviceTypeId);