Merge remote-tracking branch 'origin/10.0'

Change-Id: I98e5e1ad43103984b490c65cdeed84b7414303b3
2023-05-11 10:33:18 +02:00
parent 37cf70aeba 7960c1f3f6
commit 7f5876b45a
19 changed files with 185 additions and 75 deletions
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -213,10 +213,14 @@ bool getCurrentOverriddenSettings(const Utils::FilePath &filePath)
    const ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::projectForFile(
        filePath);

-    return getProjectUseGlobalSettings(project) ? !TextEditor::TextEditorSettings::codeStyle("Cpp")
-                                                       ->currentPreferences()
-                                                       ->isTemporarilyReadOnly()
-                                                : getProjectOverriddenSettings(project);
+    return getProjectUseGlobalSettings(project)
+               ? !TextEditor::TextEditorSettings::codeStyle("Cpp")
+                         ->currentPreferences()
+                         ->isTemporarilyReadOnly()
+                     && !TextEditor::TextEditorSettings::codeStyle("Cpp")
+                             ->currentPreferences()
+                             ->isAdditionalTabDisabled()
+               : getProjectOverriddenSettings(project);
 }

 ClangFormatSettings::Mode getProjectIndentationOrFormattingSettings(