forked from qt-creator/qt-creator
Show active run configuration name in "mismatching configuration" dialog
So the user better knows what he is actually choosing a new build configuration for. Reviewed-by: Robert Loehning
This commit is contained in:
@@ -2161,8 +2161,6 @@ BuildConfigDialog::BuildConfigDialog(Project *project, QWidget *parent)
|
||||
));
|
||||
descriptiveText->setWordWrap(true);
|
||||
vlayout->addWidget(descriptiveText);
|
||||
QHBoxLayout *hlayout = new QHBoxLayout;
|
||||
hlayout->addWidget(new QLabel(tr("Choose build configuration:")));
|
||||
m_configCombo = new QComboBox;
|
||||
QSharedPointer<RunConfiguration> activeRun = m_project->activeRunConfiguration();
|
||||
foreach (BuildConfiguration *config, m_project->buildConfigurations()) {
|
||||
@@ -2176,10 +2174,12 @@ BuildConfigDialog::BuildConfigDialog(Project *project, QWidget *parent)
|
||||
m_changeBuildConfiguration->setEnabled(false);
|
||||
}
|
||||
|
||||
|
||||
hlayout->addWidget(m_configCombo);
|
||||
hlayout->addStretch(10);
|
||||
vlayout->addLayout(hlayout);
|
||||
QFormLayout *formlayout = new QFormLayout;
|
||||
formlayout->addRow(ActiveConfigurationWidget::tr("Active run configuration"),
|
||||
// ^ avoiding a new translatable string for active run configuration
|
||||
new QLabel(activeRun->name()));
|
||||
formlayout->addRow(tr("Choose build configuration:"), m_configCombo);
|
||||
vlayout->addLayout(formlayout);
|
||||
vlayout->addWidget(buttonBox);
|
||||
m_cancel->setDefault(true);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user