summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-12-20 12:01:21 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-12-21 21:01:45 +0000
commit6531fa731203debe1b42dedfa225bfa2e1847064 (patch)
tree86c78f54d737f7f49810289d47a561143bcfba0a /recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch
parentc8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (diff)
downloadmeta-qt5-6531fa731203debe1b42dedfa225bfa2e1847064.tar.gz
qtbase: use v5.12.0 as base
* restore 0018-Fix-compile-issue-with-gcc-9.patch which is only in v5.12.1 * zlib detection got broken probably in: commit e80bf655e922e9864f8843b5e7bbb47019a6d95a Author: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Date: Thu Dec 7 19:30:07 2017 +0100 configure: verify header presence against sources Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch
new file mode 100644
index 00000000..db79e846
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch
@@ -0,0 +1,28 @@
1From cde196cf74805cc0f47fbebce884a871859862b2 Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@qt.io>
3Date: Tue, 13 Nov 2018 16:00:23 +0100
4Subject: [PATCH] Fix compile issue with gcc 9
5
6It appears messenne_twisters in the latest libstdc++ has one more
7requirement before it is willing to construct with our
8SystemGenerator struct as an sseq provider.
9
10Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe
11Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13---
14 src/corelib/global/qrandom.cpp | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
18index 23e5e499b2..03534cf453 100644
19--- a/src/corelib/global/qrandom.cpp
20+++ b/src/corelib/global/qrandom.cpp
21@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator
22 #endif // Q_OS_WINRT
23
24 static SystemGenerator &self();
25+ typedef quint32 result_type;
26 void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept);
27
28 // For std::mersenne_twister_engine implementations that use something