ProjectExplorer: Merge SimpleBuildStepWidget into BuildStepWidget

The extra m_step member is not worth the abstraction, especially
since almost all non-SimpleBuildStepWidget have something similar,
too. Also, as several derived classes needed to correct
SimpleBuildStepWidget's setShowWidget(false).

Change-Id: I6e80d8c84c363b90dc27c70abd7fa6cefa1ed91e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/android/androidbuildapkwidget.cpp

@@ -57,7 +57,7 @@ namespace Android {
 namespace Internal {
 
 AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step)
-    : ProjectExplorer::BuildStepConfigWidget(),
+    : ProjectExplorer::BuildStepConfigWidget(step),
       m_ui(new Ui::AndroidBuildApkWidget),
       m_step(step)
 {
@@ -230,6 +230,7 @@ void AndroidBuildApkInnerWidget::updateSigningWarning()
 // AndroidBuildApkWidget
 
 AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
+    BuildStepConfigWidget(step),
     m_step(step)
 {
     m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);

src/plugins/android/androiddeployqtwidget.cpp

@@ -36,7 +36,7 @@ using namespace Android;
 using namespace Internal;
 
 AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
-    : ProjectExplorer::BuildStepConfigWidget(),
+    : ProjectExplorer::BuildStepConfigWidget(step),
       m_ui(new Ui::AndroidDeployQtWidget),
       m_step(step)
 {

src/plugins/android/androidpackageinstallationstep.cpp

@@ -126,9 +126,8 @@ bool AndroidPackageInstallationStep::immutable() const
 namespace Internal {
 
 AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step)
-    : m_step(step)
+    : BuildStepConfigWidget(step, false)
 {
-    setShowWidget(false);
 }
 
 QString AndroidPackageInstallationStepWidget::summaryText() const

src/plugins/android/androidpackageinstallationstep.h

@@ -61,8 +61,6 @@ public:
 
     QString summaryText() const override;
     QString displayName() const override;
-private:
-    AndroidPackageInstallationStep *m_step;
 };
 
 class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory