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

Qmake: Fix dialog title when separateDebugInfo is changed

Browse Source 
Change-Id: Iadfa3e74794b7a4a17b77b1b212894a4b2830c7d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Nikita Baryshnikov
2017-12-08 15:41:49 +03:00
parent 990da15c1e
commit aa7995bae1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -587,15 +587,15 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
connect(m_ui->qmlDebuggingLibraryCheckBox, &QCheckBox::toggled, connect(m_ui->qmlDebuggingLibraryCheckBox, &QCheckBox::toggled,
this, &QMakeStepConfigWidget::linkQmlDebuggingLibraryChecked); this, &QMakeStepConfigWidget::linkQmlDebuggingLibraryChecked);
connect(m_ui->qmlDebuggingLibraryCheckBox, &QCheckBox::clicked, connect(m_ui->qmlDebuggingLibraryCheckBox, &QCheckBox::clicked,
this, &QMakeStepConfigWidget::askForRebuild); this, [this] { askForRebuild(tr("QML Debugging")); });
connect(m_ui->qtQuickCompilerCheckBox, &QAbstractButton::toggled, connect(m_ui->qtQuickCompilerCheckBox, &QAbstractButton::toggled,
this, &QMakeStepConfigWidget::useQtQuickCompilerChecked); this, &QMakeStepConfigWidget::useQtQuickCompilerChecked);
connect(m_ui->qtQuickCompilerCheckBox, &QCheckBox::clicked, connect(m_ui->qtQuickCompilerCheckBox, &QCheckBox::clicked,
this, &QMakeStepConfigWidget::askForRebuild); this, [this] { askForRebuild(tr("QML Debugging")); });
connect(m_ui->separateDebugInfoCheckBox, &QAbstractButton::toggled, connect(m_ui->separateDebugInfoCheckBox, &QAbstractButton::toggled,
this, &QMakeStepConfigWidget::separateDebugInfoChecked); this, &QMakeStepConfigWidget::separateDebugInfoChecked);
connect(m_ui->separateDebugInfoCheckBox, &QCheckBox::clicked, connect(m_ui->separateDebugInfoCheckBox, &QCheckBox::clicked,
this, &QMakeStepConfigWidget::askForRebuild); this, [this] { askForRebuild(tr("QMake Configuration")); });
connect(step, &QMakeStep::userArgumentsChanged, connect(step, &QMakeStep::userArgumentsChanged,
this, &QMakeStepConfigWidget::userArgumentsChanged); this, &QMakeStepConfigWidget::userArgumentsChanged);
connect(step, &QMakeStep::linkQmlDebuggingLibraryChanged, connect(step, &QMakeStep::linkQmlDebuggingLibraryChanged,
@@ -738,10 +738,10 @@ void QMakeStepConfigWidget::linkQmlDebuggingLibraryChecked(bool checked)
updateQmlDebuggingOption(); updateQmlDebuggingOption();
} }
void QMakeStepConfigWidget::askForRebuild() void QMakeStepConfigWidget::askForRebuild(const QString &title)
{ {
QMessageBox *question = new QMessageBox(Core::ICore::mainWindow()); 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->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->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
question->setModal(true); question->setModal(true);

2
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -213,7 +213,7 @@ private:
void linkQmlDebuggingLibraryChecked(bool checked); void linkQmlDebuggingLibraryChecked(bool checked);
void useQtQuickCompilerChecked(bool checked); void useQtQuickCompilerChecked(bool checked);
void separateDebugInfoChecked(bool checked); void separateDebugInfoChecked(bool checked);
void askForRebuild(); void askForRebuild(const QString &title);
void recompileMessageBoxFinished(int button); void recompileMessageBoxFinished(int button);