From 48d2fd6dedb5433f0bb3c24725e3f8a4c273cae3 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 27 Feb 2019 16:33:09 +0100 Subject: [PATCH] CMake: Clear up confusion in "Configuration has changed" message box Fixes: QTCREATORBUG-22059 Change-Id: I74642993f9171f8777901ba85c36d3e6cce7d739 Reviewed-by: Tobias Hunger --- src/plugins/cmakeprojectmanager/builddirmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp index f17e356509d..055da7d2acb 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp +++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp @@ -413,7 +413,7 @@ bool BuildDirManager::checkConfiguration() QStringList keyList = changedKeys.keys(); Utils::sort(keyList); QString table = QString::fromLatin1("") - .arg(tr("Key")).arg(tr("CMake")).arg(tr("Project")); + .arg(tr("Key")).arg(tr("CMakeCache.txt")).arg(tr("Project")); foreach (const QString &k, keyList) { const QPair data = changedKeys.value(k); table += QString::fromLatin1("\n") @@ -426,7 +426,7 @@ bool BuildDirManager::checkConfiguration() QPointer box = new QMessageBox(Core::ICore::mainWindow()); box->setText(tr("CMake configuration has changed on disk.")); 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); box->setDefaultButton(defaultButton);
%1%2%3
%1%2%3