diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2022-03-22 18:06:07 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-03-25 13:36:50 +0000 |
| commit | b97c9494af2d4d6e53bcc87b588f21a4f445ef6f (patch) | |
| tree | a273e074978621bb4da8f7fe09054b41a7625370 | |
| parent | a3e0b139de16e08dd72464f50d14ffc5ce4f0b34 (diff) | |
| download | qt-creator-b97c9494af2d4d6e53bcc87b588f21a4f445ef6f.tar.gz | |
ClangFormat: Adapt to LLVM 15 API change
Task-number: QTCREATORBUG-27170
Change-Id: I3676792da351f52199b1bf303c596e581469d7a5
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | src/plugins/clangformat/clangformatutils.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index 83aa58c167..cf32bff354 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -53,7 +53,10 @@ clang::format::FormatStyle qtcStyle() style.Language = FormatStyle::LK_Cpp; style.AccessModifierOffset = -4; style.AlignAfterOpenBracket = FormatStyle::BAS_Align; -#if LLVM_VERSION_MAJOR >= 12 +#if LLVM_VERSION_MAJOR >= 15 + style.AlignConsecutiveAssignments = {false}; + style.AlignConsecutiveDeclarations = {false}; +#elif LLVM_VERSION_MAJOR >= 12 style.AlignConsecutiveAssignments = FormatStyle::ACS_None; style.AlignConsecutiveDeclarations = FormatStyle::ACS_None; #else |