diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-01-04 08:43:15 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-01-10 09:56:37 +0000 |
| commit | f4c8cef8586d28f51f69a78717c10093f8a9f730 (patch) | |
| tree | 8c7d340ed1103fe38b87ddd0edeebadf8a7a1b36 /recipes-qt/qt5/qtbase | |
| parent | be8bc9f575ed214111222e0c474830dc06f44610 (diff) | |
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.patch | 28 | ||||
| -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 @@ +From c94a6510ae983e46f60e0cfb1b0f20229c990d93 Mon Sep 17 00:00:00 2001 +From: Ville Voutilainen <ville.voutilainen@qt.io> +Date: Fri, 4 Jan 2019 09:35:40 +0200 +Subject: [PATCH] Fix qbswap calls for Big Endian targets + +Upstream-Status: Backport +Task-number: QTBUG-71945 +Change-Id: I5356f8e32d00ea591b1f65cdd4111276fcf876ac +--- + src/corelib/global/qendian.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h +index f2e5833468..615f523888 100644 +--- a/src/corelib/global/qendian.h ++++ b/src/corelib/global/qendian.h +@@ -204,9 +204,9 @@ template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source) + template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) + { return source; } + template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) +-{ return qbswap<T>(source); } ++{ return qbswap(source); } + template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) +-{ return qbswap<T>(source); } ++{ return qbswap(source); } + template <typename T> inline void qToBigEndian(T src, void *dest) + { qToUnaligned<T>(src, dest); } + 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 @@ -From f8ae183b543b1244fb272f26db330f52e0d53161 Mon Sep 17 00:00:00 2001 +From 7af04e47ddfb4d285aab6bbb7efb46eb06252ba2 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [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 @@ -From 4d5e38f1b5f42d61428b7984f9f4d7f22ebe2a2e Mon Sep 17 00:00:00 2001 +From 94cfb4e78bf96e8947ed0c91900e463b99857b30 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature |