ProjectExplorer: Change BuildStepConfigWidget::summaryWidget()

From a virtual function to a normal one backed by a real data member.

That's essentially what several re-implementations did, the other
ones used a fixed value instead.

Change-Id: I61e45f1d4f7f0f80fe2eb1f2729785f37e7bb803
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-10-15 17:52:15 +02:00
parent fb1c562c2e
commit d6c605d84c
35 changed files with 34 additions and 179 deletions

View File

@@ -63,6 +63,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
{
m_ui->setupUi(this);
setDisplayName(tr("<b>Build Android APK</b>"));
setSummaryText(displayName());
// Target sdk combobox
const int minApiSupported = AndroidManager::apiLevelRange().first;
@@ -134,11 +135,6 @@ AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget()
delete m_ui;
}
QString AndroidBuildApkInnerWidget::summaryText() const
{
return displayName();
}
void AndroidBuildApkInnerWidget::setTargetSdk(const QString &sdk)
{
m_step->setBuildTargetSdk(sdk);
@@ -230,6 +226,7 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
m_step(step)
{
setDisplayName(tr("<b>Build Android APK</b>"));
setSummaryText(tr("<b>Build Android APK</b>"));
m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
@@ -321,10 +318,5 @@ void AndroidBuildApkWidget::checkEnableRemoveButton()
m_removeAndroidExtraLibButton->setEnabled(m_androidExtraLibsListView->selectionModel()->hasSelection());
}
QString AndroidBuildApkWidget::summaryText() const
{
return tr("<b>Build Android APK</b>");
}
} // Internal
} // Android

View File

@@ -63,7 +63,6 @@ private:
void updateKeyStorePath(const QString &path);
void signPackageCheckBoxToggled(bool checked);
QString summaryText() const override;
void setCertificates();
Ui::AndroidBuildApkWidget *m_ui;
@@ -85,8 +84,6 @@ private:
void removeAndroidExtraLib();
void checkEnableRemoveButton();
QString summaryText() const final;
private:
QListView *m_androidExtraLibsListView = nullptr;
QToolButton *m_removeAndroidExtraLibButton = nullptr;

View File

@@ -42,6 +42,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
{
m_ui->setupUi(this);
setDisplayName(tr("<b>Deploy configurations</b>"));
setSummaryText(displayName());
m_ui->uninstallPreviousPackage->setChecked(m_step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep);
m_ui->uninstallPreviousPackage->setEnabled(m_step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall);
@@ -61,11 +62,6 @@ AndroidDeployQtWidget::~AndroidDeployQtWidget()
delete m_ui;
}
QString AndroidDeployQtWidget::summaryText() const
{
return displayName();
}
void AndroidDeployQtWidget::installMinistro()
{
QString packagePath =

View File

@@ -51,8 +51,6 @@ private:
void cleanLibsOnDevice();
void resetDefaultDevices();
QString summaryText() const override;
Ui::AndroidDeployQtWidget *m_ui;
AndroidDeployQtStep *m_step;
};

View File

@@ -129,11 +129,7 @@ AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(Andro
: BuildStepConfigWidget(step, false)
{
setDisplayName(tr("Make install"));
}
QString AndroidPackageInstallationStepWidget::summaryText() const
{
return "<b>" + tr("Make install") + "</b>";
setSummaryText("<b>" + tr("Make install") + "</b>");
}
//

View File

@@ -58,8 +58,6 @@ class AndroidPackageInstallationStepWidget : public ProjectExplorer::BuildStepCo
Q_OBJECT
public:
AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step);
QString summaryText() const override;
};
class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory