20200424.1 global branch merge.current-20200424.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

1 files changed, 11 insertions, 0 deletions

diff --git a/development/qt-creator/clang-9.patch b/development/qt-creator/clang-9.patch
new file mode 100644
index 0000000000..d3e18b6a04
--- /dev/null
+++ b/development/qt-creator/clang-9.patch
@@ -0,0 +1,11 @@
+--- a/src/plugins/clangformat/clangformatutils.cpp	2019-09-23 22:09:30.394472064 +1000
++++ a/src/plugins/clangformat/clangformatutils.cpp	2019-09-23 22:11:54.426645315 +1000
+@@ -60,7 +60,7 @@ 
+     style.AllowShortBlocksOnASingleLine = false;
+     style.AllowShortCaseLabelsOnASingleLine = false;
+     style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
+-    style.AllowShortIfStatementsOnASingleLine = false;
++    style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never;
+     style.AllowShortLoopsOnASingleLine = false;
+     style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
+     style.AlwaysBreakBeforeMultilineStrings = false;