iOS: Simplify IosDeployStep config widget setup

There's nothing special here.

Change-Id: Ifce935a7c6e8dd6d745d27353cde3f2c370d0abc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/ios/ios.pro

@@ -23,7 +23,6 @@ HEADERS += \
     iosbuildstep.h \
     iostoolhandler.h \
     iosdeploystep.h \
-    iosdeploystepwidget.h \
     simulatorcontrol.h \
     iosbuildconfiguration.h \
     iosbuildsettingswidget.h \
@@ -47,7 +46,6 @@ SOURCES += \
     iosbuildstep.cpp \
     iostoolhandler.cpp \
     iosdeploystep.cpp \
-    iosdeploystepwidget.cpp \
     simulatorcontrol.cpp \
     iosbuildconfiguration.cpp \
     iosbuildsettingswidget.cpp \
@@ -58,7 +56,6 @@ SOURCES += \
 FORMS += \
     iossettingswidget.ui \
     iosbuildstep.ui \
-    iosdeploystepwidget.ui \
     iospresetbuildstep.ui \
     iosbuildsettingswidget.ui \
     createsimulatordialog.ui \

src/plugins/ios/ios.qbs

@@ -31,9 +31,6 @@ QtcPlugin {
         "iosconstants.h",
         "iosdeploystep.cpp",
         "iosdeploystep.h",
-        "iosdeploystepwidget.cpp",
-        "iosdeploystepwidget.h",
-        "iosdeploystepwidget.ui",
         "iosdevice.cpp",
         "iosdevice.h",
         "iosdsymbuildstep.cpp",

src/plugins/ios/iosdeploystep.cpp

@@ -31,6 +31,7 @@
 #include "iostoolhandler.h"
 
 #include <coreplugin/messagemanager.h>
+
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
@@ -197,7 +198,16 @@ void IosDeployStep::handleErrorMsg(IosToolHandler *handler, const QString &msg)
 
 BuildStepConfigWidget *IosDeployStep::createConfigWidget()
 {
-    return new IosDeployStepWidget(this);
+    auto widget = new BuildStepConfigWidget(this);
+
+    widget->setObjectName("IosDeployStepWidget");
+    widget->setDisplayName(QString("<b>%1</b>").arg(displayName()));
+    widget->setSummaryText(widget->displayName());
+
+    connect(this, &ProjectConfiguration::displayNameChanged,
+            widget, &BuildStepConfigWidget::updateSummary);
+
+    return widget;
 }
 
 bool IosDeployStep::fromMap(const QVariantMap &map)

src/plugins/ios/iosdeploystepwidget.cpp

@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "iosdeploystepwidget.h"
-#include "ui_iosdeploystepwidget.h"
-
-#include "iosdeploystep.h"
-#include "iosrunconfiguration.h"
-
-#include <coreplugin/icore.h>
-
-namespace Ios {
-namespace Internal {
-
-IosDeployStepWidget::IosDeployStepWidget(IosDeployStep *step) :
-    ProjectExplorer::BuildStepConfigWidget(step),
-    ui(new Ui::IosDeployStepWidget),
-    m_step(step)
-{
-    setDisplayName(QString::fromLatin1("<b>%1</b>").arg(m_step->displayName()));
-    setSummaryText(displayName());
-    ui->setupUi(this);
-    connect(m_step, &ProjectExplorer::ProjectConfiguration::displayNameChanged,
-            this, &ProjectExplorer::BuildStepConfigWidget::updateSummary);
-}
-
-IosDeployStepWidget::~IosDeployStepWidget()
-{
-    delete ui;
-}
-
-} // namespace Internal
-} // namespace Ios

src/plugins/ios/iosdeploystepwidget.h

@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <projectexplorer/buildstep.h>
-
-namespace Ios {
-namespace Internal {
-
-namespace Ui { class IosDeployStepWidget; }
-
-class IosDeployStep;
-
-class IosDeployStepWidget : public ProjectExplorer::BuildStepConfigWidget
-{
-    Q_OBJECT
-
-public:
-    IosDeployStepWidget(IosDeployStep *step);
-    ~IosDeployStepWidget() override;
-
-private:
-    Ui::IosDeployStepWidget *ui;
-    IosDeployStep *m_step;
-};
-
-} // namespace Internal
-} // namespace Ios

src/plugins/ios/iosdeploystepwidget.ui

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Ios::Internal::IosDeployStepWidget</class>
- <widget class="QWidget" name="IosDeployStepWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>479</width>
-    <height>76</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout" name="gridLayout"/>
- </widget>
- <resources/>
- <connections/>
-</ui>