Merge remote-tracking branch 'origin/9.0'

Conflicts:
	src/libs/utils/filepath.cpp

Change-Id: I04761cf7c99ed67322a592cbd0ae48c1ae9c708a
This commit is contained in:
Eike Ziller
2023-01-25 14:11:01 +01:00
7 changed files with 72 additions and 68 deletions

View File

@@ -100,15 +100,15 @@ QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer
"Do you want to save it under a different name, or close "
"the editor?").arg(QDir::toNativeSeparators(fileName));
QMessageBox box(QMessageBox::Question, title, msg, QMessageBox::NoButton, parent);
QPushButton *saveas =
box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "Save &as..."),
QMessageBox::ActionRole);
QPushButton *close =
box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "&Close"),
QMessageBox::RejectRole);
QPushButton *closeAll =
box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "C&lose All"),
QMessageBox::RejectRole);
QPushButton *saveas =
box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "Save &as..."),
QMessageBox::ActionRole);
QPushButton *save =
box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "&Save"),
QMessageBox::AcceptRole);