mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 04:22:55 +01:00
db82ecbefe
6988a2f097e9af50e1b4222550b2593bfc5685ea build: Update qt package up to 5.15.10 (Hennadii Stepanov) Pull request description: The Qt 5.15.10 contains at least three important for us fixes: -8bb90ab760, which allows us to drop the [`dont_hardcode_x86_64.patch`](fd8ab08558/depends/patches/qt/dont_hardcode_x86_64.patch) -8467beddb7, which allows us to drop the [`fix_montery_include.patch`](fd8ab08558/depends/patches/qt/fix_montery_include.patch) -df08a21fa4, which addresses https://github.com/bitcoin/bitcoin/pull/28349#issuecomment-1743519614 ACKs for top commit: fanquake: ACK 6988a2f097e9af50e1b4222550b2593bfc5685ea. Tree-SHA512: 838c44cf0d7508714f35887bb1f0983e59d96764f08f467bbd03d102d7152e797daeedc178afb03141115cc3be623e4ef7c4c4c65c0a8d1f0bb9702c9a6f8fc6
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
Fix unusable memory_resource on macos
|
|
|
|
See https://bugreports.qt.io/browse/QTBUG-117484
|
|
and https://bugreports.qt.io/browse/QTBUG-114316
|
|
|
|
--- a/qtbase/src/corelib/tools/qduplicatetracker_p.h
|
|
+++ b/qtbase/src/corelib/tools/qduplicatetracker_p.h
|
|
@@ -52,7 +52,7 @@
|
|
|
|
#include <qglobal.h>
|
|
|
|
-#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
|
|
+#ifdef __cpp_lib_memory_resource
|
|
# include <unordered_set>
|
|
# include <memory_resource>
|
|
#else
|
|
|
|
--- a/qtbase/src/corelib/global/qcompilerdetection.h
|
|
+++ b/qtbase/src/corelib/global/qcompilerdetection.h
|
|
@@ -1050,16 +1050,22 @@
|
|
# endif // !_HAS_CONSTEXPR
|
|
# endif // !__GLIBCXX__ && !_LIBCPP_VERSION
|
|
# endif // Q_OS_QNX
|
|
-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
|
|
- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
|
+# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
|
|
+# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
|
// Apple has not updated libstdc++ since 2007, which means it does not have
|
|
// <initializer_list> or std::move. Let's disable these features
|
|
-# undef Q_COMPILER_INITIALIZER_LISTS
|
|
-# undef Q_COMPILER_RVALUE_REFS
|
|
-# undef Q_COMPILER_REF_QUALIFIERS
|
|
+# undef Q_COMPILER_INITIALIZER_LISTS
|
|
+# undef Q_COMPILER_RVALUE_REFS
|
|
+# undef Q_COMPILER_REF_QUALIFIERS
|
|
// Also disable <atomic>, since it's clearly not there
|
|
-# undef Q_COMPILER_ATOMICS
|
|
-# endif
|
|
+# undef Q_COMPILER_ATOMICS
|
|
+# endif
|
|
+# if defined(__cpp_lib_memory_resource) \
|
|
+ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \
|
|
+ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
|
|
+# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
|
|
+# endif
|
|
+# endif // (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
|
|
# if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
|
|
// ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
|
|
// (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
|