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

ProjectExplorer: Ensure unique build config name earlier

Browse Source 
So that the potentially corrected name will be used to derive the
initial build directory.
Also fix the uniqueName() function so that it does not generally allow to
re-use the current build config's name.

Fixes: QTCREATORBUG-31470
Change-Id: If69f3dd2da2ba6d14d40dd686f4e35c2946c0591
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
Christian Kandeler
2024-08-21 13:29:18 +02:00
parent 1a87fbb7f0
commit 84c754de66
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View File

@@ -203,12 +203,15 @@ void BuildSettingsWidget::createConfiguration(const BuildInfo &info_)
BuildInfo info = info_;
if (info.displayName.isEmpty()) {
bool ok = false;
info.displayName = QInputDialog::getText(Core::ICore::dialogParent(),
Tr::tr("New Configuration"),
Tr::tr("New configuration name:"),
QLineEdit::Normal,
QString(),
&ok)
info.displayName = uniqueName(
QInputDialog::getText(
Core::ICore::dialogParent(),
Tr::tr("New Configuration"),
Tr::tr("New configuration name:"),
QLineEdit::Normal,
QString(),
&ok),
false)
.trimmed();
if (!ok || info.displayName.isEmpty())
return;
@@ -222,13 +225,13 @@ void BuildSettingsWidget::createConfiguration(const BuildInfo &info_)
m_target->setActiveBuildConfiguration(bc, SetActive::Cascade);
}
QString BuildSettingsWidget::uniqueName(const QString & name)
QString BuildSettingsWidget::uniqueName(const QString &name, bool allowCurrentName)
{
QString result = name.trimmed();
if (!result.isEmpty()) {
QStringList bcNames;
for (BuildConfiguration *bc : m_target->buildConfigurations()) {
if (bc == m_buildConfiguration)
if (allowCurrentName && bc == m_buildConfiguration)
continue;
bcNames.append(bc->displayName());
}
@@ -249,12 +252,11 @@ void BuildSettingsWidget::renameConfiguration()
if (!ok)
return;
name = uniqueName(name);
name = uniqueName(name, true);
if (name.isEmpty())
return;
m_buildConfiguration->setDisplayName(name);
}
void BuildSettingsWidget::cloneConfiguration()
@@ -265,11 +267,14 @@ void BuildSettingsWidget::cloneConfiguration()
return;
//: Title of a the cloned BuildConfiguration window, text of the window
QString name = uniqueName(QInputDialog::getText(this,
Tr::tr("Clone Configuration"),
Tr::tr("New configuration name:"),
QLineEdit::Normal,
m_buildConfiguration->displayName()));
QString name = uniqueName(
QInputDialog::getText(
this,
Tr::tr("Clone Configuration"),
Tr::tr("New configuration name:"),
QLineEdit::Normal,
m_buildConfiguration->displayName()),
false);
if (name.isEmpty())
return;

2
src/plugins/projectexplorer/buildsettingspropertiespage.h
View File

@@ -43,7 +43,7 @@ private:
void createConfiguration(const BuildInfo &info);
void cloneConfiguration();
void deleteConfiguration(BuildConfiguration *toDelete);
QString uniqueName(const QString &name);
QString uniqueName(const QString &name, bool allowCurrentName);
Target *m_target = nullptr;
BuildConfiguration *m_buildConfiguration = nullptr;