summaryrefslogtreecommitdiff
path: root/.clang-format
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-07-25 03:05:35 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-09-17 12:28:55 +0300
commitf6bb7844396e5f36cc196a6a61aa5547c14deb33 (patch)
treea4aa6e465b4a8cdb30791abeba9c3e583ac3363b /.clang-format
parentef1a7aad70384f574c60807148aaf245607310a9 (diff)
downloadqtlocation-mapboxgl-f6bb7844396e5f36cc196a6a61aa5547c14deb33.tar.gz
[build] CI config
Run it in parallel with the old build system. This will offer a migration path and make sure we keep everything working at the cost of running many CI bots. New stuff is prefixed with "next". Appveyor already got migrated to the next buildsystem. After merging, we will follow-up removing duplicated core bots.
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format23
1 files changed, 7 insertions, 16 deletions
diff --git a/.clang-format b/.clang-format
index ff0f39e73b..cacdf25308 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,18 +1,9 @@
-Standard: Cpp11
-IndentWidth: 4
+---
+Language: Cpp
+BasedOnStyle: Google
AccessModifierOffset: -4
-UseTab: Never
-BinPackParameters: false
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-AlwaysBreakTemplateDeclarations: true
-NamespaceIndentation: None
-PointerBindsToType: true
-SpacesInParentheses: false
-BreakBeforeBraces: Attach
-ColumnLimit: 100
-Cpp11BracedListStyle: false
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 120
+IndentWidth: 4
SpacesBeforeTrailingComments: 1
+...