diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-11-29 15:11:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-11-29 17:25:47 +0000 |
| commit | 11d4bb8a1bf1c0e320832fcbd0aaa6633885ed8d (patch) | |
| tree | e3b2d1a9f544d79eda8eaef7c74936dd48e2bbb2 | |
| parent | abf0b51ff585bb4439ec9dcab615303bc78195bc (diff) | |
| download | meta-boot2qt-11d4bb8a1bf1c0e320832fcbd0aaa6633885ed8d.tar.gz | |
qtbase: update patch for 5.10.0 RC2
Change-Id: I79d6f5c35f5960f3b42ef5942f4f767d6ae4e65e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch b/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch index 720a8ef..26c7838 100644 --- a/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch +++ b/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From ef03baa1188f411948f99c18d5e9414721996158 Mon Sep 17 00:00:00 2001 | 1 | From 655618933b78f53bb4338c8b7e3109da780ad3c6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
| 3 | Date: Thu, 23 Nov 2017 11:28:47 +0200 | 3 | Date: Thu, 23 Nov 2017 11:28:47 +0200 |
| 4 | Subject: [PATCH] disable qt_random_cpu | 4 | Subject: [PATCH] disable qt_random_cpu |
| @@ -11,7 +11,7 @@ Change-Id: Ieba798a9599a6d683c6630c6cd3731b2b909b628 | |||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 12 | 12 | ||
| 13 | diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp | 13 | diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp |
| 14 | index 72ac8d3..10a8390 100644 | 14 | index 6769190..c1a775a 100644 |
| 15 | --- a/src/corelib/global/qrandom.cpp | 15 | --- a/src/corelib/global/qrandom.cpp |
| 16 | +++ b/src/corelib/global/qrandom.cpp | 16 | +++ b/src/corelib/global/qrandom.cpp |
| 17 | @@ -92,7 +92,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando | 17 | @@ -92,7 +92,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando |
| @@ -20,6 +20,6 @@ index 72ac8d3..10a8390 100644 | |||
| 20 | 20 | ||
| 21 | -#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) | 21 | -#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) |
| 22 | +#if 0 | 22 | +#if 0 |
| 23 | static qssize_t qt_random_cpu(void *buffer, qssize_t count) Q_DECL_NOTHROW; | 23 | static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW; |
| 24 | 24 | ||
| 25 | # ifdef Q_PROCESSOR_X86_64 | 25 | # ifdef Q_PROCESSOR_X86_64 |