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

CMake: Clear up confusion in "Configuration has changed" message box

Browse Source 
Fixes: QTCREATORBUG-22059
Change-Id: I74642993f9171f8777901ba85c36d3e6cce7d739
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Cristian Adam
2019-02-27 16:33:09 +01:00
parent f45da77738
commit 48d2fd6ded
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/builddirmanager.cpp
View File

@@ -413,7 +413,7 @@ bool BuildDirManager::checkConfiguration()
QStringList keyList = changedKeys.keys(); QStringList keyList = changedKeys.keys();
Utils::sort(keyList); Utils::sort(keyList);
QString table = QString::fromLatin1("<table><tr><th>%1</th><th>%2</th><th>%3</th></tr>") QString table = QString::fromLatin1("<table><tr><th>%1</th><th>%2</th><th>%3</th></tr>")
.arg(tr("Key")).arg(tr("CMake")).arg(tr("Project")); .arg(tr("Key")).arg(tr("CMakeCache.txt")).arg(tr("Project"));
foreach (const QString &k, keyList) { foreach (const QString &k, keyList) {
const QPair<QString, QString> data = changedKeys.value(k); const QPair<QString, QString> data = changedKeys.value(k);
table += QString::fromLatin1("\n<tr><td>%1</td><td>%2</td><td>%3</td></tr>") table += QString::fromLatin1("\n<tr><td>%1</td><td>%2</td><td>%3</td></tr>")
@@ -426,7 +426,7 @@ bool BuildDirManager::checkConfiguration()
QPointer<QMessageBox> box = new QMessageBox(Core::ICore::mainWindow()); QPointer<QMessageBox> box = new QMessageBox(Core::ICore::mainWindow());
box->setText(tr("CMake configuration has changed on disk.")); box->setText(tr("CMake configuration has changed on disk."));
box->setInformativeText(table); box->setInformativeText(table);
auto *defaultButton = box->addButton(tr("Overwrite Changes in CMake"), QMessageBox::RejectRole); auto *defaultButton = box->addButton(tr("Overwrite Changes in CMakeCache.txt"), QMessageBox::RejectRole);
auto *applyButton = box->addButton(tr("Apply Changes to Project"), QMessageBox::ApplyRole); auto *applyButton = box->addButton(tr("Apply Changes to Project"), QMessageBox::ApplyRole);
box->setDefaultButton(defaultButton); box->setDefaultButton(defaultButton);