summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-01-04 08:43:15 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2019-01-10 09:56:37 +0000
commitf4c8cef8586d28f51f69a78717c10093f8a9f730 (patch)
tree8c7d340ed1103fe38b87ddd0edeebadf8a7a1b36 /recipes-qt/qt5/qtbase
parentbe8bc9f575ed214111222e0c474830dc06f44610 (diff)
downloadmeta-qt5-f4c8cef8586d28f51f69a78717c10093f8a9f730.tar.gz
qtbase: Fix qtopcua issue on bigendian systems
See http://errors.yoctoproject.org/Errors/Details/213681/ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch28
-rw-r--r--recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch (renamed from recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch)2
-rw-r--r--recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch (renamed from recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch)2
3 files changed, 30 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch b/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch
new file mode 100644
index 00000000..4169fb76
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch
@@ -0,0 +1,28 @@
1From c94a6510ae983e46f60e0cfb1b0f20229c990d93 Mon Sep 17 00:00:00 2001
2From: Ville Voutilainen <ville.voutilainen@qt.io>
3Date: Fri, 4 Jan 2019 09:35:40 +0200
4Subject: [PATCH] Fix qbswap calls for Big Endian targets
5
6Upstream-Status: Backport
7Task-number: QTBUG-71945
8Change-Id: I5356f8e32d00ea591b1f65cdd4111276fcf876ac
9---
10 src/corelib/global/qendian.h | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
14index f2e5833468..615f523888 100644
15--- a/src/corelib/global/qendian.h
16+++ b/src/corelib/global/qendian.h
17@@ -204,9 +204,9 @@ template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source)
18 template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source)
19 { return source; }
20 template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source)
21-{ return qbswap<T>(source); }
22+{ return qbswap(source); }
23 template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source)
24-{ return qbswap<T>(source); }
25+{ return qbswap(source); }
26 template <typename T> inline void qToBigEndian(T src, void *dest)
27 { qToUnaligned<T>(src, dest); }
28 template <typename T> inline void qToLittleEndian(T src, void *dest)
diff --git a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch
index 2d942289..4958d432 100644
--- a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
1From f8ae183b543b1244fb272f26db330f52e0d53161 Mon Sep 17 00:00:00 2001 1From 7af04e47ddfb4d285aab6bbb7efb46eb06252ba2 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100 3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH] Always build uic and qvkgen 4Subject: [PATCH] Always build uic and qvkgen
diff --git a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch
index 733e69ac..02ab9900 100644
--- a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
1From 4d5e38f1b5f42d61428b7984f9f4d7f22ebe2a2e Mon Sep 17 00:00:00 2001 1From 94cfb4e78bf96e8947ed0c91900e463b99857b30 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 24 Nov 2017 15:16:31 +0200 3Date: Fri, 24 Nov 2017 15:16:31 +0200
4Subject: [PATCH] Bootstrap without linkat feature 4Subject: [PATCH] Bootstrap without linkat feature