From 50e35581d75db2487b667662713e3e4608b7cd05 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 25 Feb 2020 00:51:31 +0100 Subject: qtbase: update patches for latest 5.15 revision Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0e36004d..ba707cc8 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -17,8 +17,8 @@ require qt5-native.inc require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared -# 5.14.meta-qt5-shared.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared +# 5.15.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -36,13 +36,13 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-qfloat16-check-for-__ARM_FP-2.patch \ - file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ + file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ + file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native -# 5.14.meta-qt5-native.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native +# 5.15.meta-qt5-native.1 SRC_URI += " \ file://0019-Always-build-uic-and-qvkgen.patch \ file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ -- cgit v1.2.3