diff options
| author | Andreas Müller <schnitzeltony@gmail.com> | 2021-05-08 13:07:06 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-05-08 13:26:45 +0200 |
| commit | 5dfe73a6ef890e66beff3d0b49d4a03dcb474de1 (patch) | |
| tree | 59c8fc71073bf3978410fcfedd39428ff2885b61 | |
| parent | 41027a6188fb851b35425b7ffecaa6eb420d3f01 (diff) | |
qt5-creator: upgrade 4.14.2 -> 4.15.0
* 4.15.0 build fine with gcc11
* backported patch can go - it is upstream
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-12.patch | 45 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5-creator_git.bb | 7 |
2 files changed, 3 insertions, 49 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-12.patch b/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-12.patch deleted file mode 100644 index e204d5e6..00000000 --- a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-12.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 25e7b2c5d608f71aba694224e5160fc430731b6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de> -Date: Fri, 29 Jan 2021 18:01:37 +0100 -Subject: [PATCH] clangformat: Fix build with LLVM 12 - -Change-Id: I493afce92b16291cf66fc510129f2154a7162847 -Reviewed-by: David Schulz <david.schulz@qt.io> - -Fixes: -| ../../../../git/src/plugins/clangformat/clangformatutils.cpp: In function 'clang::format::FormatStyle ClangFormat::qtcStyle()': -| ../../../../git/src/plugins/clangformat/clangformatutils.cpp:54:41: error: cannot convert 'bool' to 'clang::format::FormatStyle::AlignConsecutiveStyle' in assignment -| 54 | style.AlignConsecutiveAssignments = false; -| | ^~~~~ -| ../../../../git/src/plugins/clangformat/clangformatutils.cpp:55:42: error: cannot convert 'bool' to 'clang::format::FormatStyle::AlignConsecutiveStyle' in assignment -| 55 | style.AlignConsecutiveDeclarations = false; -| | ^~~~~ - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> - -Upstream-Status: Backport ---- - src/plugins/clangformat/clangformatutils.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp -index 8e11c15364..a249327d0e 100644 ---- a/src/plugins/clangformat/clangformatutils.cpp -+++ b/src/plugins/clangformat/clangformatutils.cpp -@@ -51,8 +51,13 @@ static clang::format::FormatStyle qtcStyle() - style.Language = FormatStyle::LK_Cpp; - style.AccessModifierOffset = -4; - style.AlignAfterOpenBracket = FormatStyle::BAS_Align; -+#if LLVM_VERSION_MAJOR >= 12 -+ style.AlignConsecutiveAssignments = FormatStyle::ACS_None; -+ style.AlignConsecutiveDeclarations = FormatStyle::ACS_None; -+#else - style.AlignConsecutiveAssignments = false; - style.AlignConsecutiveDeclarations = false; -+#endif - style.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign; - #if LLVM_VERSION_MAJOR >= 11 - style.AlignOperands = FormatStyle::OAS_Align; --- -2.30.2 - diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index 1a12862e..95873381 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb @@ -17,14 +17,13 @@ inherit qmake5 mime-xdg DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib" DEPENDS_append_libc-musl = " libexecinfo" -SRCREV = "c34b9502275d0d1d5b88d7a63bff076e2a164836" -PV = "4.14.2+git${SRCPV}" +SRCREV = "978f6caf1e18ad0b0415fde60a8c130448969c6d" +PV = "4.15.0+git${SRCPV}" # Patches from https://github.com/meta-qt5/qtcreator/commits/b4.9.2 # 4.9.2.meta-qt5.1 SRC_URI = " \ - git://code.qt.io/qt-creator/qt-creator.git;branch=4.14 \ + git://code.qt.io/qt-creator/qt-creator.git;branch=4.15 \ file://0001-app-Use-malloc_trim-only-on-glibc.patch \ - file://0002-clangformat-Fix-build-with-LLVM-12.patch \ " SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch" |