qtcreator: update to 4.10.2

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2019-11-07 15:13:52 +01:00
parent 443ab1eda7
commit 129de088ff
No known key found for this signature in database
GPG key ID: DE55AD8DBEBB4EE8
2 changed files with 2 additions and 13 deletions

View file

@ -1,11 +0,0 @@
--- src/plugins/clangformat/clangformatutils.cpp
+++ src/plugins/clangformat/clangformatutils.cpp
@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcStyle()
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;

View file

@ -1,6 +1,6 @@
# Template file for 'qtcreator'
pkgname=qtcreator
version=4.10.1
version=4.10.2
revision=1
wrksrc="qt-creator-opensource-src-${version}"
build_style=qmake
@ -14,7 +14,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-3.0-only,QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
checksum=5098d87027bec3296bd93a7e112588759ccb0511fbfdc5558c1a1e83dff8d2a9
checksum=9add6bdddfe5726bb02535409c2ed788b1afeee082121f54f887281d0e3c449a
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"