diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2022-08-16 21:04:39 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2022-08-18 09:43:30 +0000 |
| commit | c7cdd55dea1f30b4d236d532bdadcf36bd174640 (patch) | |
| tree | 5c214d097759f023413e0e7dee72dc40ac021f10 /src/plugins/clangformat | |
| parent | 5a8d7c3d51dcb671578aee8541b32c13c5688acb (diff) | |
ClangFormat: Fix build for LLVM 15.0.0
This fixes the CMake build of Qt Creator against LLVM 15.0.0
Change-Id: Icecd45821091c8c2b565246cb17ce5a6e5c49f36
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/clangformat')
| -rw-r--r-- | src/plugins/clangformat/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/clangformat/clangformatutils.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/clangformat/CMakeLists.txt b/src/plugins/clangformat/CMakeLists.txt index 61ebc03c42..9a0d230315 100644 --- a/src/plugins/clangformat/CMakeLists.txt +++ b/src/plugins/clangformat/CMakeLists.txt @@ -13,6 +13,8 @@ add_qtc_plugin(ClangFormat clangformatplugin.cpp clangformatplugin.h clangformatsettings.cpp clangformatsettings.h clangformatutils.cpp clangformatutils.h + EXPLICIT_MOC + clangformatconfigwidget.cpp clangformatconfigwidget.h ) if(TARGET ClangFormat) diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index 230078558e..973c105077 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -118,7 +118,9 @@ clang::format::FormatStyle qtcStyle() style.ColumnLimit = 100; style.CommentPragmas = "^ IWYU pragma:"; style.CompactNamespaces = false; +#if LLVM_VERSION_MAJOR < 15 style.ConstructorInitializerAllOnOneLineOrOnePerLine = false; +#endif style.ConstructorInitializerIndentWidth = 4; style.ContinuationIndentWidth = 4; style.Cpp11BracedListStyle = true; |