diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:42:26 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:57:32 +0200 |
commit | f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch) | |
tree | d0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch | |
parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
parent | 1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff) | |
download | meta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz |
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits)
qtbase: Use pcre packages by default
qt5: use PACKAGECONFIG to disable tests and examples
qtlocation: use geoclue 2
qtbase: use offscreen platform plugin for tools
qtbase: add openssl PACKAGECONFIG for native nativesdk
qtbase-native: disable vulkan support
maliit-framework-qt5: fix test installations
qtenginio: remove obsolete module
ogl-runtime: update to v2.5.0 release
qtquick3d: add recipe
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qt5: Update to Qt 5.14.0
qtbase: Fix patch fuzz detected with devtool
qtbase: Backport the patch from upstream gerrit
qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
qtwebengine: Move CharAllocator definition to header
qt5-creator: Add missing dep on libz.so
qt5-creator: Make clang-format patch work with multiple clang versions
qtwebengine: Include cstddef for size_t definition
...
Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch index 8411b83d..ebaa7b65 100644 --- a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch +++ b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b938d809624660a2998ea7f844aba715e40acfc6 Mon Sep 17 00:00:00 2001 | 1 | From a0f5ac48354dd86aaa53c07e08e30098c62f5097 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 5 Oct 2019 16:21:08 -0700 | 3 | Date: Sat, 5 Oct 2019 16:21:08 -0700 |
4 | Subject: [PATCH] qfloat16: check for __ARM_FP & 2 | 4 | Subject: [PATCH] qfloat16: check for __ARM_FP & 2 |
@@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
21 | 21 | ||
22 | diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp | 22 | diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp |
23 | index 87ff796368..37dec371a6 100644 | 23 | index 6c21b7de5a..98d34a96a5 100644 |
24 | --- a/src/corelib/global/qfloat16.cpp | 24 | --- a/src/corelib/global/qfloat16.cpp |
25 | +++ b/src/corelib/global/qfloat16.cpp | 25 | +++ b/src/corelib/global/qfloat16.cpp |
26 | @@ -148,7 +148,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype | 26 | @@ -205,7 +205,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype |
27 | #undef f16cextern | 27 | #undef f16cextern |
28 | } | 28 | } |
29 | 29 | ||