summaryrefslogtreecommitdiff
path: root/.clang-format
diff options
context:
space:
mode:
authorMarcus Tillmanns <marcus.tillmanns@qt.io>2022-12-13 08:42:07 +0100
committerhjk <hjk@qt.io>2022-12-20 11:39:33 +0000
commitd63b2ca51f4a48358fc7c2ae635a88ac60beda38 (patch)
treec95a850332207c923f974908a0d78615ee31c8f2 /.clang-format
parentf81724f45819ae6c08b8a9d0390b1eeadc9ce4df (diff)
downloadqt-creator-d63b2ca51f4a48358fc7c2ae635a88ac60beda38.tar.gz
ClangFormat: Parse clang-format file when needed
Previously the .clang-format was parsed even if there is an override active. Fixed .clang-format to follow style-guide more closely. Change-Id: I39c5e5793cfe9e8a996e084e4ba169231a9bcebb Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format2
1 files changed, 1 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format
index 97f7f2b234..1b9871712f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -90,7 +90,7 @@ NamespaceIndentation: None
ObjCBlockIndentWidth: 4
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 150
+PenaltyBreakAssignment: 88
PenaltyBreakBeforeFirstCallParameter: 300
PenaltyBreakComment: 500
PenaltyBreakFirstLessLess: 400