From aa7995bae1ade1d0595be60fc99862fe73d2d8bb Mon Sep 17 00:00:00 2001 From: Nikita Baryshnikov Date: Fri, 8 Dec 2017 15:41:49 +0300 Subject: [PATCH] Qmake: Fix dialog title when separateDebugInfo is changed Change-Id: Iadfa3e74794b7a4a17b77b1b212894a4b2830c7d Reviewed-by: Orgad Shaneh Reviewed-by: Eike Ziller --- src/plugins/qmakeprojectmanager/qmakestep.cpp | 10 +++++----- src/plugins/qmakeprojectmanager/qmakestep.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index f6dd003d55b..fcde394dfd5 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -587,15 +587,15 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step) connect(m_ui->qmlDebuggingLibraryCheckBox, &QCheckBox::toggled, this, &QMakeStepConfigWidget::linkQmlDebuggingLibraryChecked); connect(m_ui->qmlDebuggingLibraryCheckBox, &QCheckBox::clicked, - this, &QMakeStepConfigWidget::askForRebuild); + this, [this] { askForRebuild(tr("QML Debugging")); }); connect(m_ui->qtQuickCompilerCheckBox, &QAbstractButton::toggled, this, &QMakeStepConfigWidget::useQtQuickCompilerChecked); connect(m_ui->qtQuickCompilerCheckBox, &QCheckBox::clicked, - this, &QMakeStepConfigWidget::askForRebuild); + this, [this] { askForRebuild(tr("QML Debugging")); }); connect(m_ui->separateDebugInfoCheckBox, &QAbstractButton::toggled, this, &QMakeStepConfigWidget::separateDebugInfoChecked); connect(m_ui->separateDebugInfoCheckBox, &QCheckBox::clicked, - this, &QMakeStepConfigWidget::askForRebuild); + this, [this] { askForRebuild(tr("QMake Configuration")); }); connect(step, &QMakeStep::userArgumentsChanged, this, &QMakeStepConfigWidget::userArgumentsChanged); connect(step, &QMakeStep::linkQmlDebuggingLibraryChanged, @@ -738,10 +738,10 @@ void QMakeStepConfigWidget::linkQmlDebuggingLibraryChecked(bool checked) updateQmlDebuggingOption(); } -void QMakeStepConfigWidget::askForRebuild() +void QMakeStepConfigWidget::askForRebuild(const QString &title) { QMessageBox *question = new QMessageBox(Core::ICore::mainWindow()); - question->setWindowTitle(tr("QML Debugging")); + question->setWindowTitle(title); question->setText(tr("The option will only take effect if the project is recompiled. Do you want to recompile now?")); question->setStandardButtons(QMessageBox::Yes | QMessageBox::No); question->setModal(true); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index f6488cfaa02..65544ad046d 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -213,7 +213,7 @@ private: void linkQmlDebuggingLibraryChecked(bool checked); void useQtQuickCompilerChecked(bool checked); void separateDebugInfoChecked(bool checked); - void askForRebuild(); + void askForRebuild(const QString &title); void recompileMessageBoxFinished(int button);