diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-02 09:28:43 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-18 12:19:46 +0000 |
| commit | 8c7dd57645ab30f760846f7cbf57121d763d8473 (patch) | |
| tree | f44f2a9ddf084aa4517d39f757ff230b0dd2d08a | |
| parent | 383ea95889d7f841ebe5047572861febf65f0450 (diff) | |
| download | qt-creator-8c7dd57645ab30f760846f7cbf57121d763d8473.tar.gz | |
Clang: Build against LLVM/Clang 9
Task-numer: QTCREATORBUG-23038
Change-Id: I3608bca6541614bb55e67d35c87334957cd02761
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
(cherry picked from commit 6ec8017bc675692f3d325c0cd95c9c4c7a79db7d)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | src/plugins/clangformat/clangformatutils.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index 59c2b592d7..f087f77a94 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -60,7 +60,11 @@ static clang::format::FormatStyle qtcStyle() style.AllowShortBlocksOnASingleLine = false; style.AllowShortCaseLabelsOnASingleLine = false; style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; +#if LLVM_VERSION_MAJOR >= 9 + style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never; +#else style.AllowShortIfStatementsOnASingleLine = false; +#endif style.AllowShortLoopsOnASingleLine = false; style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; style.AlwaysBreakBeforeMultilineStrings = false; |