diff options
| author | fanquake <fanquake@gmail.com> | 2020-07-29 18:29:58 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-12-03 14:07:12 +0800 |
| commit | c870027cc261ebe6e0e2030df06619a8f663e80a (patch) | |
| tree | d56385460aaf58d70071ff5cfea4fbe291608e90 /depends/patches/qt/fix_limits_header.patch | |
| parent | 904ba2aa40c5399b956fd97c8b38bca8a1aa32c7 (diff) | |
| download | bitcoin-c870027cc261ebe6e0e2030df06619a8f663e80a.tar.xz | |
build: qt 5.15.2
Diffstat (limited to 'depends/patches/qt/fix_limits_header.patch')
| -rw-r--r-- | depends/patches/qt/fix_limits_header.patch | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/depends/patches/qt/fix_limits_header.patch b/depends/patches/qt/fix_limits_header.patch index e4313770e5..cb5a8cd1b5 100644 --- a/depends/patches/qt/fix_limits_header.patch +++ b/depends/patches/qt/fix_limits_header.patch @@ -19,17 +19,16 @@ Upstream commits: #include <stdlib.h> #include <string.h> ---- old/qtbase/src/corelib/tools/qbytearraymatcher.h -+++ new/qtbase/src/corelib/tools/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include <QtCore/qbytearray.h> +--- old/qtbase/src/corelib/global/qfloat16.h ++++ new/qtbase/src/corelib/global/qfloat16.h +@@ -43,6 +43,7 @@ + #include <QtCore/qglobal.h> + #include <QtCore/qmetatype.h> +#include <limits> -+ - QT_BEGIN_NAMESPACE - + #include <string.h> + #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) --- old/qtbase/src/tools/moc/generator.cpp +++ new/qtbase/src/tools/moc/generator.cpp @@ -42,3 +41,24 @@ Upstream commits: #include <math.h> #include <stdio.h> +--- old/qtbase/src/corelib/text/qbytearraymatcher.h ++++ new/qtbase/src/corelib/text/qbytearraymatcher.h +@@ -42,6 +42,8 @@ + + #include <QtCore/qbytearray.h> + ++#include <limits> ++ + QT_BEGIN_NAMESPACE + + +--- old/qtbase/src/corelib/tools/qoffsetstringarray_p.h ++++ new/qtbase/src/corelib/tools/qoffsetstringarray_p.h +@@ -55,6 +55,7 @@ + + #include <tuple> + #include <array> ++#include <limits> + + QT_BEGIN_NAMESPACE + |