ClangFormat: Fix clangformat ignores configuration file

Fixes: QTCREATORBUG-29145 Change-Id: I6950151aaab9df51cfdd0af0ad9cf3c7b35c0636 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-11 14:52:51 +02:00
parent c6a69023c9
commit 948dc6b37e
3 changed files with 9 additions and 8 deletions
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -214,12 +214,7 @@ bool getCurrentOverriddenSettings(const Utils::FilePath &filePath)
        filePath);

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