diff options
| author | David Schulz <david.schulz@qt.io> | 2024-02-27 08:34:28 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2024-02-27 11:11:52 +0000 |
| commit | 82399ac9c54dcdbe03e4240c5b2ffe6850a95afd (patch) | |
| tree | 9991e8d7eaeb2cbc82fbae4f8f3b4521788b0d1f | |
| parent | 4dcba2ad259514fe21cda500120c05e0f7d1f094 (diff) | |
ClangFormat: Fix compile against latest llvm main branch
Change-Id: I6fe414721103d00eb3212040c1aafa2ef123b9d1
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| -rw-r--r-- | src/plugins/clangformat/clangformatutils.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index 4036d34f6d..747c30c2a5 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -59,9 +59,14 @@ clang::format::FormatStyle calculateQtcStyle() style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never; style.AllowShortLoopsOnASingleLine = false; - style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; style.AlwaysBreakBeforeMultilineStrings = false; +#if LLVM_VERSION_MAJOR >= 19 + style.BreakAfterReturnType = FormatStyle::RTBS_None; + style.BreakTemplateDeclarations = FormatStyle::BTDS_Yes; +#else + style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; style.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes; +#endif style.BinPackArguments = false; style.BinPackParameters = false; style.BraceWrapping.AfterClass = true; |