summaryrefslogtreecommitdiff
path: root/.clang-format
diff options
context:
space:
mode:
authorYixue Wang <wangyixue@uniontech.com>2023-01-30 11:45:51 +0800
committerastereborn <astereborn@codereview.qt-project.org>2023-02-16 09:28:50 +0000
commit227e66b62c767f282302b07f8e642da230c52eb5 (patch)
tree880d6efaf934dff331ccf4dab98dd391dc932fb2 /.clang-format
parent8257369b73ec4911d53034165d3f10fb2c062c48 (diff)
downloadqt-creator-227e66b62c767f282302b07f8e642da230c52eb5.tar.gz
ClangFormat: Correct .clang-format
.clang-format contains some disallowed values for some fields. These fields are corrected according to ClangFormatStyleOptions. Change-Id: I32a40cdfeabee550ebf23f6c9cb3d1fafc3b764b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format10
1 files changed, 5 insertions, 5 deletions
diff --git a/.clang-format b/.clang-format
index 1b9871712f..0a0df0c152 100644
--- a/.clang-format
+++ b/.clang-format
@@ -23,19 +23,19 @@ AlignEscapedNewlines: DontAlign
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: true
+AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterClass: true
- AfterControlStatement: false
+ AfterControlStatement: Never
AfterEnum: false
AfterFunction: true
AfterNamespace: false
@@ -99,7 +99,7 @@ PenaltyExcessCharacter: 50
PenaltyReturnTypeOnItsOwnLine: 300
PointerAlignment: Right
ReflowComments: false
-SortIncludes: true
+SortIncludes: CaseSensitive
SortUsingDeclarations: true
SpaceAfterCStyleCast: true
SpaceAfterTemplateKeyword: false
@@ -112,6 +112,6 @@ SpacesInContainerLiterals: false
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
-Standard: Cpp11
+Standard: c++11
TabWidth: 4
UseTab: Never