Commit 2d25e629 authored by Kai Koehne's avatar Kai Koehne

Do not show rebuild dialog when checkboxes are changed from code

Only show the "Do you want to recompile now?" modal dialog if the
"Enable QML debugging" or "Enable Qt Quick Compiler" checkboxes have
been changed directly by the user.

The previous change let the QML debugging checkbox update also when the
.pro file has changed. Showing a modal dialog in such cases interrupts
the user's flow, and is unexpected.

Change-Id: I9304cbecee7e201694ff72ac8c0f38cedf5fb416
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent 081115e5
......@@ -476,10 +476,14 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
this, SLOT(qmakeArgumentsLineEdited()));
connect(m_ui->buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(buildConfigurationSelected()));
connect(m_ui->qmlDebuggingLibraryCheckBox, SIGNAL(toggled(bool)),
this, SLOT(linkQmlDebuggingLibraryChecked(bool)));
connect(m_ui->qmlDebuggingLibraryCheckBox, &QCheckBox::toggled,
this, &QMakeStepConfigWidget::linkQmlDebuggingLibraryChecked);
connect(m_ui->qmlDebuggingLibraryCheckBox, &QCheckBox::clicked,
this, &QMakeStepConfigWidget::askForRebuild);
connect(m_ui->qtQuickCompilerCheckBox, &QAbstractButton::toggled,
this, &QMakeStepConfigWidget::useQtQuickCompilerChecked);
connect(m_ui->qtQuickCompilerCheckBox, &QCheckBox::clicked,
this, &QMakeStepConfigWidget::askForRebuild);
connect(step, SIGNAL(userArgumentsChanged()),
this, SLOT(userArgumentsChanged()));
connect(step, SIGNAL(linkQmlDebuggingLibraryChanged()),
......@@ -605,7 +609,6 @@ void QMakeStepConfigWidget::linkQmlDebuggingLibraryChecked(bool checked)
updateSummaryLabel();
updateEffectiveQMakeCall();
updateQmlDebuggingOption();
askForRebuild();
}
void QMakeStepConfigWidget::askForRebuild()
......@@ -631,7 +634,6 @@ void QMakeStepConfigWidget::useQtQuickCompilerChecked(bool checked)
updateSummaryLabel();
updateEffectiveQMakeCall();
updateQtQuickCompilerOption();
askForRebuild();
}
void QMakeStepConfigWidget::updateSummaryLabel()
......
......@@ -165,6 +165,7 @@ private slots:
void buildConfigurationSelected();
void linkQmlDebuggingLibraryChecked(bool checked);
void useQtQuickCompilerChecked(bool checked);
void askForRebuild();
private slots:
void recompileMessageBoxFinished(int button);
......@@ -174,7 +175,6 @@ private:
void updateQmlDebuggingOption();
void updateQtQuickCompilerOption();
void updateEffectiveQMakeCall();
void askForRebuild();
void setSummaryText(const QString &);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment