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