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/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -215,9 +215,10 @@ bool getCurrentOverriddenSettings(const Utils::FilePath &filePath)
    const ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::projectForFile(
        filePath);

-    return getProjectUseGlobalSettings(project)
-               ? ClangFormatSettings::instance().overrideDefaultFile()
-               : getProjectOverriddenSettings(project);
+    return getProjectUseGlobalSettings(project) ? !TextEditor::TextEditorSettings::codeStyle("Cpp")
+                                                       ->currentPreferences()
+                                                       ->isTemporarilyReadOnly()
+                                                : getProjectOverriddenSettings(project);
 }

 ClangFormatSettings::Mode getProjectIndentationOrFormattingSettings(