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

13
src/plugins/android/androidbuildapkwidget.cpp
View File

@@ -62,6 +62,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
m_step(step)
{
m_ui->setupUi(this);
setDisplayName(tr("<b>Build Android APK</b>"));
// Target sdk combobox
const int minApiSupported = AndroidManager::apiLevelRange().first;
@@ -133,11 +134,6 @@ AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget()
delete m_ui;
}
QString AndroidBuildApkInnerWidget::displayName() const
{
return tr("<b>Build Android APK</b>");
}
QString AndroidBuildApkInnerWidget::summaryText() const
{
return displayName();
@@ -233,6 +229,8 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
BuildStepConfigWidget(step),
m_step(step)
{
setDisplayName(tr("<b>Build Android APK</b>"));
m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
auto base = new AndroidBuildApkInnerWidget(step);
@@ -328,10 +326,5 @@ QString AndroidBuildApkWidget::summaryText() const
return tr("<b>Build Android APK</b>");
}
QString AndroidBuildApkWidget::displayName() const
{
return summaryText();
}
} // Internal
} // Android