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

QMakeStep: fix linkDebuggingHelper

Browse Source 
Just showing the widget was setting the linkDebuggingHelper setting.

Change-Id: I0188d713394e35c3519d9bbd822cb970363a68eb
Reviewed-on: http://codereview.qt.nokia.com/215
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
dt_
2011-05-30 13:01:33 +02:00
committed by Kai Koehne
parent 2761e8da5a
commit 6b0e6072f5
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -470,6 +470,16 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
m_ignoreChange(false) m_ignoreChange(false)
{ {
m_ui->setupUi(this); 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&)), connect(m_ui->qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(const QString&)),
this, SLOT(qmakeArgumentsLineEdited())); this, SLOT(qmakeArgumentsLineEdited()));
connect(m_ui->buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)), connect(m_ui->buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)),
@@ -499,14 +509,7 @@ QMakeStepConfigWidget::~QMakeStepConfigWidget()
void QMakeStepConfigWidget::init() 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 QString QMakeStepConfigWidget::summaryText() const