diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-14 12:10:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-14 12:10:15 +0100 |
| commit | bbce3228af9561dbde8aa7acd968f98d33d3f649 (patch) | |
| tree | 65653bb85845f4da8a4a79558f628bda61ed6194 /_clang-format | |
| parent | 05455843158054656296f89051f594a5a5bfdbc0 (diff) | |
| parent | 675deb147463a9354aebd4a487783a41d578917c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
coin/provisioning/common/linux/emsdk.sh
Change-Id: I9ba6a1c52b70b605f0f856b6ce6912fd499792a3
Diffstat (limited to '_clang-format')
| -rw-r--r-- | _clang-format | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/_clang-format b/_clang-format index ff57c819..589baff3 100644 --- a/_clang-format +++ b/_clang-format @@ -13,9 +13,10 @@ BasedOnStyle: WebKit Standard: Cpp11 -# Leave the line breaks up to the user. +# Column width is limited to 100 in accordance with Qt Coding Style. +# https://wiki.qt.io/Qt_Coding_Style # Note that this may be changed at some point in the future. -ColumnLimit: 0 +ColumnLimit: 100 # How much weight do extra characters after the line length limit have. # PenaltyExcessCharacter: 4 @@ -77,4 +78,5 @@ SortIncludes: false # macros for which the opening brace stays attached. ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] - +# Break constructor initializers before the colon and after the commas. +BreakConstructorInitializers: BeforeColon |