Skip to content
Permalink
Browse files

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 6ec8017)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
  • Loading branch information
nikolaivk committed Oct 2, 2019
1 parent 383ea95 commit 8c7dd57645ab30f760846f7cbf57121d763d8473
Showing with 4 additions and 0 deletions.
  1. +4 −0 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;

0 comments on commit 8c7dd57

Please sign in to comment.
You can’t perform that action at this time.