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

ProjectExplorer: Make BuildStepConfigWidget::displayName a value

Browse Source 
Use BuildStep::displayName() as default.

This probably could be the only possibility, but currently there
are some discrepancies that are kept in this patch to make
the patch mechanical.

Change-Id: I2a1e5c2ff37ad95e25309eb16e07099e42191f60
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-10-12 17:52:09 +02:00
parent 5fc1b5d8e7
commit 683e7aa6cf
35 changed files with 24 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/ios/iosbuildstep.cpp
View File

@@ -211,6 +211,8 @@ IosBuildStepConfigWidget::IosBuildStepConfigWidget(IosBuildStep *buildStep)
m_ui = new Ui::IosBuildStep;
m_ui->setupUi(this);
setDisplayName(tr("iOS build", "iOS BuildStep display name."));
Project *pro = m_buildStep->target()->project();
m_ui->buildArgumentsTextEdit->setPlainText(Utils::QtcProcess::joinArgs(
@@ -247,11 +249,6 @@ IosBuildStepConfigWidget::~IosBuildStepConfigWidget()
delete m_ui;
}
QString IosBuildStepConfigWidget::displayName() const
{
return tr("iOS build", "iOS BuildStep display name.");
}
void IosBuildStepConfigWidget::updateDetails()
{
BuildConfiguration *bc = m_buildStep->buildConfiguration();

1
src/plugins/ios/iosbuildstep.h
View File

@@ -77,7 +77,6 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
IosBuildStepConfigWidget(IosBuildStep *buildStep);
~IosBuildStepConfigWidget();
QString displayName() const override;
QString summaryText() const override;
private:

6
src/plugins/ios/iosdeploystepwidget.cpp
View File

@@ -39,6 +39,7 @@ IosDeployStepWidget::IosDeployStepWidget(IosDeployStep *step) :
ui(new Ui::IosDeployStepWidget),
m_step(step)
{
setDisplayName(QString::fromLatin1("<b>%1</b>").arg(m_step->displayName()));
ui->setupUi(this);
connect(m_step, &ProjectExplorer::ProjectConfiguration::displayNameChanged,
this, &ProjectExplorer::BuildStepConfigWidget::updateSummary);
@@ -49,11 +50,6 @@ IosDeployStepWidget::~IosDeployStepWidget()
delete ui;
}
QString IosDeployStepWidget::displayName() const
{
return QString::fromLatin1("<b>%1</b>").arg(m_step->displayName());
}
QString IosDeployStepWidget::summaryText() const
{
return displayName();

1
src/plugins/ios/iosdeploystepwidget.h
View File

@@ -44,7 +44,6 @@ public:
private:
QString summaryText() const override;
QString displayName() const override;
Ui::IosDeployStepWidget *ui;
IosDeployStep *m_step;

5
src/plugins/ios/iosdsymbuildstep.cpp
View File

@@ -267,11 +267,6 @@ IosDsymBuildStepConfigWidget::~IosDsymBuildStepConfigWidget()
delete m_ui;
}
QString IosDsymBuildStepConfigWidget::displayName() const
{
return m_buildStep->displayName();
}
void IosDsymBuildStepConfigWidget::updateDetails()
{
BuildConfiguration *bc = m_buildStep->buildConfiguration();

1
src/plugins/ios/iosdsymbuildstep.h
View File

@@ -74,7 +74,6 @@ class IosDsymBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidg
public:
IosDsymBuildStepConfigWidget(IosDsymBuildStep *buildStep);
~IosDsymBuildStepConfigWidget();
QString displayName() const override;
QString summaryText() const override;
private: