1From 55b91a76172a3235b4879daf0b675519d5b02db7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de>
3Date: Wed, 16 Jun 2021 20:59:29 +0200
4Subject: [PATCH] clangformat: Fix build with LLVM 13
5
6Change-Id: Ia9db10696fd129c8b989ecc4c9ecbb7f1f10e68c
7Reviewed-by: David Schulz <david.schulz@qt.io>
8
9Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7]
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 src/plugins/clangformat/clangformatutils.cpp | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
16index 2f9a306b99..3905ae5f6a 100644
17--- a/src/plugins/clangformat/clangformatutils.cpp
18+++ b/src/plugins/clangformat/clangformatutils.cpp
19@@ -157,7 +157,11 @@ static clang::format::FormatStyle qtcStyle()
20     style.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements;
21     style.SpaceInEmptyParentheses = false;
22     style.SpacesBeforeTrailingComments = 1;
23+#if LLVM_VERSION_MAJOR >= 13
24+    style.SpacesInAngles = FormatStyle::SIAS_Never;
25+#else
26     style.SpacesInAngles = false;
27+#endif
28     style.SpacesInContainerLiterals = false;
29     style.SpacesInCStyleCastParentheses = false;
30     style.SpacesInParentheses = false;
31--
322.31.1
33
34