mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-16 23:02:38 -03:00
ef20add4c9
Qt 5.15.3 release is a patch release made on the top of Qt 5.15.2. As a patch release, Qt 5.15.3 does not add any new functionality but provides bug fixes and other improvements. https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.3/release-note.md * dropped patches: - patches/qt/dont_use_avx_android_x86_64.patch - patches/qt/fix_bigsur_style.patch * adjusted patches: - patches/qt/fix_android_jni_static.patch - patches/qt/fix_limits_header.patch - patches/qt/use_android_ndk23.patch Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
33 lines
756 B
Diff
33 lines
756 B
Diff
Fix compiling with GCC 11
|
|
|
|
Upstream:
|
|
- bug report: https://bugreports.qt.io/browse/QTBUG-89977
|
|
- fix in Qt 6.1: 813a928c7c3cf98670b6043149880ed5c955efb9
|
|
|
|
--- 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
|
|
|
|
|
|
|
|
Upstream fix and backports:
|
|
- Qt 6.1: 3eab20ad382569cb2c9e6ccec2322c3d08c0f716
|
|
- Qt 6.2: 380294a5971da85010a708dc23b0edec192cbf27
|
|
- Qt 6.3: 2b2b3155d9f6ba1e4f859741468fbc47db09292b
|
|
|
|
--- 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
|
|
|