diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-18 20:07:53 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 00:56:48 +0000 |
commit | 808d65c129d283850fa6c1e887dd01f8ee86b64b (patch) | |
tree | 6aaa270319d34651537cb04295398d8894617539 /recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch | |
parent | a55a9936e29b4aaaebc742d52af3b61f738d10c5 (diff) | |
download | meta-qt5-808d65c129d283850fa6c1e887dd01f8ee86b64b.tar.gz |
qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
* in preparation for rebase on 5.12 #136
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch new file mode 100644 index 00000000..2eb35600 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From eb68b9fa27d94bc90db5b0023b224ac0e60b8243 Mon Sep 17 00:00:00 2001 | ||
2 | From: Allan Sandfeld Jensen <allan.jensen@qt.io> | ||
3 | Date: Tue, 13 Nov 2018 16:00:23 +0100 | ||
4 | Subject: [PATCH] Fix compile issue with gcc 9 | ||
5 | |||
6 | It appears messenne_twisters in the latest libstdc++ has one more | ||
7 | requirement before it is willing to construct with our | ||
8 | SystemGenerator struct as an sseq provider. | ||
9 | |||
10 | Upstream-Status: Backport from 5.12 | ||
11 | |||
12 | Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe | ||
13 | Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | ||
14 | Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | ||
15 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
16 | --- | ||
17 | src/corelib/global/qrandom.cpp | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp | ||
21 | index ebf9864b15..577736a867 100644 | ||
22 | --- a/src/corelib/global/qrandom.cpp | ||
23 | +++ b/src/corelib/global/qrandom.cpp | ||
24 | @@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator | ||
25 | #endif // Q_OS_WINRT | ||
26 | |||
27 | static SystemGenerator &self(); | ||
28 | + typedef quint32 result_type; | ||
29 | void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); | ||
30 | |||
31 | // For std::mersenne_twister_engine implementations that use something | ||