lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-01 08:57:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.12' into 5.13

Browse Source 
Conflicts:
	coin/provisioning/common/linux/emsdk.sh

Change-Id: I9ba6a1c52b70b605f0f856b6ce6912fd499792a3
This commit is contained in:
Liang Qi
2019-03-14 12:10:15 +01:00
parent 0545584315 675deb1474
commit bbce3228af
5 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
_clang-format
View File

@@ -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