feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProject: Use new helper function to create run configuration widgets

Browse Source 
Change-Id: I471fe60d25bb3d8ca3ebf2d2abe8e725bc7daa56
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
hjk
2018-03-20 16:50:07 +01:00
parent c93e2815c7
commit 3bce4b9af2
3 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -146,7 +146,7 @@ QString QmlProjectRunConfiguration::commandLineArguments() const
QWidget *QmlProjectRunConfiguration::createConfigurationWidget() QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
{ {
return new QmlProjectRunConfigurationWidget(this); return wrapWidget(new QmlProjectRunConfigurationWidget(this));
} }
Utils::OutputFormatter *QmlProjectRunConfiguration::createOutputFormatter() const Utils::OutputFormatter *QmlProjectRunConfiguration::createOutputFormatter() const

5
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
View File

@@ -31,8 +31,6 @@
namespace Core { class IEditor; } namespace Core { class IEditor; }
namespace QtSupport { class BaseQtVersion; }
namespace QmlProjectManager { namespace QmlProjectManager {
class QmlProject; class QmlProject;
@@ -41,7 +39,6 @@ namespace Internal { class QmlProjectRunConfigurationWidget; }
class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplorer::RunConfiguration class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplorer::RunConfiguration
{ {
Q_OBJECT Q_OBJECT
friend class ProjectExplorer::RunConfigurationFactory;
friend class Internal::QmlProjectRunConfigurationWidget; friend class Internal::QmlProjectRunConfigurationWidget;
friend class QmlProject; // to call updateEnabled() friend class QmlProject; // to call updateEnabled()
@@ -62,7 +59,7 @@ public:
// RunConfiguration // RunConfiguration
QString disabledReason() const override; QString disabledReason() const override;
virtual QWidget *createConfigurationWidget() override; QWidget *createConfigurationWidget() override;
Utils::OutputFormatter *createOutputFormatter() const override; Utils::OutputFormatter *createOutputFormatter() const override;
QVariantMap toMap() const override; QVariantMap toMap() const override;

18
src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
View File

@@ -32,7 +32,6 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/detailswidget.h>
#include <QLineEdit> #include <QLineEdit>
#include <QComboBox> #include <QComboBox>
@@ -49,22 +48,9 @@ namespace Internal {
QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRunConfiguration *rc) : QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRunConfiguration *rc) :
m_runConfiguration(rc), m_runConfiguration(rc),
m_fileListCombo(0),
m_fileListModel(new QStandardItemModel(this)) m_fileListModel(new QStandardItemModel(this))
{ {
QVBoxLayout *layout = new QVBoxLayout(this); auto form = new QFormLayout(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);
form->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); form->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
m_fileListCombo = new QComboBox; m_fileListCombo = new QComboBox;
@@ -83,8 +69,6 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun
form->addRow(tr("Arguments:"), qmlViewerArgs); form->addRow(tr("Arguments:"), qmlViewerArgs);
form->addRow(tr("Main QML file:"), m_fileListCombo); form->addRow(tr("Main QML file:"), m_fileListCombo);
layout->addWidget(detailsWidget);
updateFileComboBox(); updateFileComboBox();
connect(rc, &QmlProjectRunConfiguration::scriptSourceChanged, connect(rc, &QmlProjectRunConfiguration::scriptSourceChanged,