From 6b0e6072f55404a32d3df00386a031771412656a Mon Sep 17 00:00:00 2001 From: dt_ Date: Mon, 30 May 2011 13:01:33 +0200 Subject: [PATCH] QMakeStep: fix linkDebuggingHelper Just showing the widget was setting the linkDebuggingHelper setting. Change-Id: I0188d713394e35c3519d9bbd822cb970363a68eb Reviewed-on: http://codereview.qt.nokia.com/215 Reviewed-by: Kai Koehne --- src/plugins/qt4projectmanager/qmakestep.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 2187f59184c..fc3be8b8024 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -470,6 +470,16 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step) m_ignoreChange(false) { m_ui->setupUi(this); + + m_ui->qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments()); + m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary()); + + qmakeBuildConfigChanged(); + + updateSummaryLabel(); + updateEffectiveQMakeCall(); + updateQmlDebuggingOption(); + connect(m_ui->qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(const QString&)), this, SLOT(qmakeArgumentsLineEdited())); connect(m_ui->buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)), @@ -499,14 +509,7 @@ QMakeStepConfigWidget::~QMakeStepConfigWidget() void QMakeStepConfigWidget::init() { - m_ui->qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments()); - m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary()); - qmakeBuildConfigChanged(); - - updateSummaryLabel(); - updateEffectiveQMakeCall(); - updateQmlDebuggingOption(); } QString QMakeStepConfigWidget::summaryText() const