Mercurial > mxe-octave

comparison src/qtbase-2-gcc11.patch @ 6113:24e29dcb2e64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents d659f1a97147
children
comparison
equal deleted inserted replaced
6112:696446c9c4f4 6113:24e29dcb2e64
2 Origin: upstream, commits: 2 Origin: upstream, commits:
3 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 3 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
4 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 4 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
5 Last-Update: 2021-01-26 5 Last-Update: 2021-01-26
6 6
7 --- a/src/corelib/global/qendian.h
8 +++ b/src/corelib/global/qendian.h
9 @@ -44,6 +44,8 @@
10 #include <QtCore/qfloat16.h>
11 #include <QtCore/qglobal.h>
12
13 +#include <limits>
14 +
15 // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
16 #include <stdlib.h>
17 #include <string.h>
18 --- a/src/corelib/global/qfloat16.h
19 +++ b/src/corelib/global/qfloat16.h
20 @@ -43,6 +43,7 @@
21
22 #include <QtCore/qglobal.h>
23 #include <QtCore/qmetatype.h>
24 +#include <limits>
25 #include <string.h>
26
27 #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
28 --- a/src/corelib/text/qbytearraymatcher.h 7 --- a/src/corelib/text/qbytearraymatcher.h
29 +++ b/src/corelib/text/qbytearraymatcher.h 8 +++ b/src/corelib/text/qbytearraymatcher.h
30 @@ -42,6 +42,8 @@ 9 @@ -42,6 +42,8 @@
31 10
32 #include <QtCore/qbytearray.h> 11 #include <QtCore/qbytearray.h>