Mercurial > mxe-octave

diff 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
line wrap: on
line diff
--- a/src/qtbase-2-gcc11.patch	Fri Mar 04 17:09:59 2022 +0100
+++ b/src/qtbase-2-gcc11.patch	Sat Mar 05 10:59:53 2022 +0100
@@ -4,27 +4,6 @@
  https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
 Last-Update: 2021-01-26
 
---- a/src/corelib/global/qendian.h
-+++ b/src/corelib/global/qendian.h
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
- 
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
---- a/src/corelib/global/qfloat16.h
-+++ b/src/corelib/global/qfloat16.h
-@@ -43,6 +43,7 @@
- 
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
- 
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
 --- a/src/corelib/text/qbytearraymatcher.h
 +++ b/src/corelib/text/qbytearraymatcher.h
 @@ -42,6 +42,8 @@