diff options
Diffstat (limited to 'src/plugins/qt4projectmanager')
8 files changed, 8 insertions, 28 deletions
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 77ac9fdd12a..44b195471bb 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -288,6 +288,14 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) m_ui->makePathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); m_ui->makePathChooser->setBaseDirectory(Utils::PathChooser::homePath()); + + const QString &makeCmd = m_makeStep->m_makeCmd; + m_ui->makePathChooser->setPath(makeCmd); + m_ui->makeArgumentsLineEdit->setText(m_makeStep->userArguments()); + + updateMakeOverrideLabel(); + updateDetails(); + connect(m_ui->makePathChooser, SIGNAL(changed(QString)), this, SLOT(makeEdited())); connect(m_ui->makeArgumentsLineEdit, SIGNAL(textEdited(QString)), @@ -382,17 +390,6 @@ void MakeStepConfigWidget::userArgumentsChanged() updateDetails(); } -void MakeStepConfigWidget::init() -{ - updateMakeOverrideLabel(); - - const QString &makeCmd = m_makeStep->m_makeCmd; - m_ui->makePathChooser->setPath(makeCmd); - - m_ui->makeArgumentsLineEdit->setText(m_makeStep->userArguments()); - updateDetails(); -} - void MakeStepConfigWidget::makeEdited() { m_makeStep->m_makeCmd = m_ui->makePathChooser->rawPath(); diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h index 235ba2ad694..1a11b727ff5 100644 --- a/src/plugins/qt4projectmanager/makestep.h +++ b/src/plugins/qt4projectmanager/makestep.h @@ -128,7 +128,6 @@ public: virtual ~MakeStepConfigWidget(); QString displayName() const; - void init(); QString summaryText() const; private slots: // User changes to our widgets diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index fc3be8b8024..554e25717e3 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -507,11 +507,6 @@ QMakeStepConfigWidget::~QMakeStepConfigWidget() delete m_ui; } -void QMakeStepConfigWidget::init() -{ - -} - QString QMakeStepConfigWidget::summaryText() const { return m_summaryText; diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 4f217e6b48d..cdb023141a3 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -142,7 +142,6 @@ class QMakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget public: QMakeStepConfigWidget(QMakeStep *step); ~QMakeStepConfigWidget(); - void init(); QString summaryText() const; QString displayName() const; private slots: diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp index 915ead93733..a2e97c1265a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp @@ -955,7 +955,3 @@ QString S60CreatePackageStepConfigWidget::displayName() const { return m_signStep->displayName(); } - -void S60CreatePackageStepConfigWidget::init() -{ -} diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h index 3465933015a..d245cd8cce0 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h @@ -191,7 +191,6 @@ class S60CreatePackageStepConfigWidget : public ProjectExplorer::BuildStepConfig public: S60CreatePackageStepConfigWidget(S60CreatePackageStep *signStep); QString displayName() const; - void init(); QString summaryText() const; private slots: diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp index dd2b58e4d31..5642aa26983 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp @@ -858,10 +858,6 @@ S60DeployStepWidget::S60DeployStepWidget() : ProjectExplorer::BuildStepConfigWid { } -void S60DeployStepWidget::init() -{ -} - QString S60DeployStepWidget::summaryText() const { return QString("<b>%1</b>").arg(displayName()); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h index 7f5fa9dfbef..af8c8645070 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h @@ -234,7 +234,6 @@ class S60DeployStepWidget : public ProjectExplorer::BuildStepConfigWidget public: S60DeployStepWidget(); - void init(); QString summaryText() const; QString displayName() const; }; |