diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-03-28 15:10:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-03-28 15:10:11 +0200 |
| commit | 780f5da7c48a7fd0f13e69094c699fccd4edf2a8 (patch) | |
| tree | 71a9bbe2ed497c5050da07e855d589059c292584 /src/plugins/clangformat | |
| parent | 93de345587c2114247c4d31f1da8d716e612b87e (diff) | |
| parent | f58add023aedcfa2b9011af512b082285eb78dfe (diff) | |
Merge remote-tracking branch 'origin/7.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/studiowelcome/recentpresets.h
src/plugins/studiowelcome/userpresets.h
Change-Id: Ie573b945eb28347a36ee1b3582fbd6ab0c0f866c
Diffstat (limited to 'src/plugins/clangformat')
| -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 |