Merge remote-tracking branch 'origin/10.0'

Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
2023-04-24 08:52:35 +02:00
parent bb9ba4349a 05f80a132d
commit c9696fbabb
33 changed files with 699 additions and 95 deletions
--- a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
@@ -203,4 +203,10 @@ void ClangFormatGlobalConfigWidget::apply()
    settings.write();
 }

+void ClangFormatGlobalConfigWidget::finish()
+{
+    m_codeStyle->currentPreferences()->setTemporarilyReadOnly(
+        !ClangFormatSettings::instance().overrideDefaultFile());
+}
+
 } // namespace ClangFormat