From 88b4d44c50e377aca3e261d8f47a969aa1f16664 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 7 Nov 2019 14:01:28 +0100 Subject: [PATCH] ProjectExplorer: Do not set run config display names unnecessarily ... when restoring a target. The run configuration may not have its default display name yet, in which case all but the first restored run configuration would get a number as its display name. Fixes: QTCREATORBUG-23123 Change-Id: I5068cb85b67166357e0a88fb9638131a24e1340f Reviewed-by: hjk --- src/plugins/projectexplorer/target.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index ecddc0d9779..d38e31d8e03 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -409,9 +409,13 @@ void Target::addRunConfiguration(RunConfiguration *rc) // Check that we don't have a configuration with the same displayName QString configurationDisplayName = rc->displayName(); - QStringList displayNames = Utils::transform(d->m_runConfigurations, &RunConfiguration::displayName); - configurationDisplayName = Utils::makeUniquelyNumbered(configurationDisplayName, displayNames); - rc->setDisplayName(configurationDisplayName); + if (!configurationDisplayName.isEmpty()) { + QStringList displayNames = Utils::transform(d->m_runConfigurations, + &RunConfiguration::displayName); + configurationDisplayName = Utils::makeUniquelyNumbered(configurationDisplayName, + displayNames); + rc->setDisplayName(configurationDisplayName); + } d->m_runConfigurations.push_back(rc);