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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Conflicts:
	src/plugins/genericprojectmanager/genericprojectplugin.cpp
	src/plugins/projectexplorer/environmentaspect.cpp
	src/plugins/projectexplorer/environmentaspect.h
	src/plugins/projectexplorer/environmentaspectwidget.cpp

Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
This commit is contained in:
Eike Ziller
2019-11-11 12:58:11 +01:00
parent a504472790 c6115771f9
commit 646c7860cb
114 changed files with 4948 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/target.cpp
View File

@@ -408,9 +408,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);