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

QmlProjectRunConfiguraiton: Simplify code

Browse Source 
Change-Id: I392e5ee1fcf89b4e4d871fa5935f065f29a67f1e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2014-01-16 12:16:25 +01:00
parent 607035545b
commit d879e30d55
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,9 +161,7 @@ QtSupport::BaseQtVersion *QmlProjectRunConfiguration::qtVersion() const
QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
{
QTC_ASSERT(m_configurationWidget.isNull(), return m_configurationWidget.data());
m_configurationWidget = new QmlProjectRunConfigurationWidget(this);
return m_configurationWidget.data();
return new QmlProjectRunConfigurationWidget(this);
}
Utils::OutputFormatter *QmlProjectRunConfiguration::createOutputFormatter() const
@@ -218,8 +216,8 @@ void QmlProjectRunConfiguration::setScriptSource(MainScriptSource source,
= target()->project()->projectDirectory() + QLatin1Char('/') + m_scriptFile;
}
updateEnabled();
if (m_configurationWidget)
m_configurationWidget.data()->updateFileComboBox();
emit scriptSourceChanged();
}
ProjectExplorer::Abi QmlProjectRunConfiguration::abi() const

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

@@ -87,6 +87,8 @@ public:
QVariantMap toMap() const;
ProjectExplorer::Abi abi() const;
signals:
void scriptSourceChanged();
private slots:
void changeCurrentFile(Core::IEditor* = 0);
@@ -113,8 +115,6 @@ private:
QString m_scriptFile;
QString m_qmlViewerArgs;
QPointer<Internal::QmlProjectRunConfigurationWidget> m_configurationWidget;
bool m_isEnabled;
};

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

@@ -84,6 +84,9 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun
layout->addWidget(detailsWidget);
updateFileComboBox();
connect(rc, SIGNAL(scriptSourceChanged()),
this, SLOT(updateFileComboBox()));
}
static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)

4
src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h
View File

@@ -49,10 +49,8 @@ class QmlProjectRunConfigurationWidget : public QWidget
public:
explicit QmlProjectRunConfigurationWidget(QmlProjectRunConfiguration *rc);
public slots:
void updateFileComboBox();
private slots:
void updateFileComboBox();
void setMainScript(int index);
void onViewerArgsChanged();