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

Merge remote-tracking branch 'origin/9.0' into 10.0

Browse Source 
Conflicts:
	src/plugins/texteditor/codestyleselectorwidget.cpp
	src/plugins/updateinfo/updateinfoplugin.cpp

Change-Id: Iac33b852ccef6018bd81188716526aa70c3f5a2d
This commit is contained in:
Eike Ziller
2023-02-10 10:29:14 +01:00
parent 3d57b1868b ff65caf62f
commit b29cb4efe1
6 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/codestyleselectorwidget.cpp
View File

@@ -207,8 +207,10 @@ void CodeStyleSelectorWidget::slotImportClicked()
if (importedStyle)
m_codeStyle->setCurrentDelegate(importedStyle);
else
QMessageBox::warning(this, Tr::tr("Import Code Style"),
Tr::tr("Cannot import code style from %1"), fileName.toUserOutput());
QMessageBox::warning(this,
Tr::tr("Import Code Style"),
Tr::tr("Cannot import code style from %1")
.arg(fileName.toUserOutput()));
}
}