diff options
| author |   Matteo Bernardini | 2020-04-24 13:43:20 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2020-04-24 13:43:20 +0200 |
| commit | 5002997e7b6f27fdd45f06fe15586c71d5620e31 (patch) | |
| tree | 5ebef2795dc0c1e0d1ebd0ee910fc7eb5a57273c /development/qt-creator | |
| parent | 19d21e0644ebff62d23b90dadba1e3409a56589d (diff) | |
| download | slackbuilds-5002997e7b6f27fdd45f06fe15586c71d5620e31.tar.gz | |
20200424.1 global branch merge.current-20200424.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'development/qt-creator')
| -rw-r--r-- | development/qt-creator/clang-9.patch | 11 | ||||
| -rw-r--r-- | development/qt-creator/qt-creator.SlackBuild | 2 |
2 files changed, 13 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; diff --git a/development/qt-creator/qt-creator.SlackBuild b/development/qt-creator/qt-creator.SlackBuild index e088f2281f..2b35b37e97 100644 --- a/development/qt-creator/qt-creator.SlackBuild +++ b/development/qt-creator/qt-creator.SlackBuild @@ -94,6 +94,8 @@ fi patch -p0 < $CWD/remove-w-error-unguarded-availability-new.patch +patch -p1 < $CWD/clang-9.patch + # Fix for https://lists.qt-project.org/pipermail/qt-creator/2019-May/008050.html QMAKE_LFLAGS="$QMAKE_LFLAGS -L/usr/lib$LIBDIRSUFFIX" |