QmlProject: Use new helper function to create run configuration widgets

Change-Id: I471fe60d25bb3d8ca3ebf2d2abe8e725bc7daa56
Reviewed-by: Ulf Hermann <[email protected]>

3 files changed, 3 insertions, 22 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 9e8df4546f8..6118e7651f4 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -146,7 +146,7 @@ QString QmlProjectRunConfiguration::commandLineArguments() const
 
 QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
 {
-    return new QmlProjectRunConfigurationWidget(this);
+    return wrapWidget(new QmlProjectRunConfigurationWidget(this));
 }
 
 Utils::OutputFormatter *QmlProjectRunConfiguration::createOutputFormatter() const
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
index db52eb36f56..78a8cfbbc22 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
@@ -31,8 +31,6 @@
 
 namespace Core { class IEditor; }
 
-namespace QtSupport { class BaseQtVersion; }
-
 namespace QmlProjectManager {
 class QmlProject;
 
@@ -41,7 +39,6 @@ namespace Internal { class QmlProjectRunConfigurationWidget; }
 class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplorer::RunConfiguration
 {
     Q_OBJECT
-    friend class ProjectExplorer::RunConfigurationFactory;
     friend class Internal::QmlProjectRunConfigurationWidget;
     friend class QmlProject; // to call updateEnabled()
 
@@ -62,7 +59,7 @@ public:
 
     // RunConfiguration
     QString disabledReason() const override;
-    virtual QWidget *createConfigurationWidget() override;
+    QWidget *createConfigurationWidget() override;
     Utils::OutputFormatter *createOutputFormatter() const override;
     QVariantMap toMap() const override;
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
index 8af2c9a7912..d9aac536cfb 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
@@ -32,7 +32,6 @@
 #include <projectexplorer/target.h>
 
 #include <utils/algorithm.h>
-#include <utils/detailswidget.h>
 
 #include <QLineEdit>
 #include <QComboBox>
@@ -49,22 +48,9 @@ namespace Internal {
 
 QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRunConfiguration *rc) :
     m_runConfiguration(rc),
-    m_fileListCombo(0),
     m_fileListModel(new QStandardItemModel(this))
 {
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
-
-    //
-    // Qt Version, Arguments
-    //
-
-    Utils::DetailsWidget *detailsWidget = new Utils::DetailsWidget();
-    detailsWidget->setState(Utils::DetailsWidget::NoSummary);
-
-    QWidget *formWidget = new QWidget(detailsWidget);
-    detailsWidget->setWidget(formWidget);
-    QFormLayout *form = new QFormLayout(formWidget);
+    auto form = new QFormLayout(this);
     form->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 
     m_fileListCombo = new QComboBox;
@@ -83,8 +69,6 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun
     form->addRow(tr("Arguments:"), qmlViewerArgs);
     form->addRow(tr("Main QML file:"), m_fileListCombo);
 
-    layout->addWidget(detailsWidget);
-
     updateFileComboBox();
 
     connect(rc, &QmlProjectRunConfiguration::scriptSourceChanged,