diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-11-13 08:01:13 +0100 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-11-13 08:17:54 +0000 |
| commit | cf816448ce48f88ecc76b8fe19cc9408b6f86723 (patch) | |
| tree | 5f4c063fb961cc757e5dc2581e7688b1b0d9a2f1 | |
| parent | 41d68f469a1e914594bb9ca812005ec5542d3459 (diff) | |
| download | qt-creator-cf816448ce48f88ecc76b8fe19cc9408b6f86723.tar.gz | |
ClangFormat: Set BreakBeforeBraces to Custom by default
If it's not set to custom some user settings are
continuously overridden which is not always expected.
Previously the default style caused some parameters
to be reset.
Change-Id: Ie0fedf6b9984116a86b7c588aed8c6b6cb35133e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| -rw-r--r-- | src/plugins/clangformat/clangformatutils.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index 6bb153b3b3..9302e15361 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -116,6 +116,8 @@ Utils::FileName currentStyleConfigPath() static clang::format::FormatStyle constructStyle(bool isGlobal) { FormatStyle style = getLLVMStyle(); + style.BreakBeforeBraces = FormatStyle::BS_Custom; + const CppCodeStyleSettings codeStyleSettings = isGlobal ? CppCodeStyleSettings::currentGlobalCodeStyle() : CppCodeStyleSettings::currentProjectCodeStyle() |