diff options
| author | Björn Schäpers <bjoern@hazardy.de> | 2021-01-29 18:01:37 +0100 |
|---|---|---|
| committer | Björn Schäpers <qt-codereview@hazardy.de> | 2021-02-01 21:04:47 +0000 |
| commit | 25e7b2c5d608f71aba694224e5160fc430731b6a (patch) | |
| tree | 2f5c2501f35eeab3a5753a9141fa0fa39036fd74 /src/plugins/clangformat | |
| parent | e34eb170dc621ba7bb9f6f2195959babe6afaa00 (diff) | |
clangformat: Fix build with LLVM 12
Change-Id: I493afce92b16291cf66fc510129f2154a7162847
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/clangformat')
| -rw-r--r-- | src/plugins/clangformat/clangformatutils.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index 8e11c153647..a249327d0ed 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -51,8 +51,13 @@ static clang::format::FormatStyle qtcStyle() style.Language = FormatStyle::LK_Cpp; style.AccessModifierOffset = -4; style.AlignAfterOpenBracket = FormatStyle::BAS_Align; +#if LLVM_VERSION_MAJOR >= 12 + style.AlignConsecutiveAssignments = FormatStyle::ACS_None; + style.AlignConsecutiveDeclarations = FormatStyle::ACS_None; +#else style.AlignConsecutiveAssignments = false; style.AlignConsecutiveDeclarations = false; +#endif style.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign; #if LLVM_VERSION_MAJOR >= 11 style.AlignOperands = FormatStyle::OAS_Align; |