aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-native_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-02-25 00:51:31 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2020-03-18 18:03:49 +0100
commit50e35581d75db2487b667662713e3e4608b7cd05 (patch)
tree1395997f8964683df36de481dafc5145920b6679 /recipes-qt/qt5/qtbase-native_git.bb
parent9f024a55b1ec17f0ddf0167a80c64dc998a5e90d (diff)
qtbase: update patches for latest 5.15 revision
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb12
1 files changed, 6 insertions, 6 deletions
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 \