diff options
| author | fanquake <fanquake@gmail.com> | 2024-04-01 16:09:56 +0200 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-04-01 16:10:42 +0200 |
| commit | 3d37ed490a1a90141ead9e393d7739cf6f5afaca (patch) | |
| tree | 21b1d8a8334a44bc6a0acf30b9e8caee6d1f8200 /depends/patches/qt/memory_resource.patch | |
| parent | b8420e4603094433deb9dd4e4fabd12dc3921c4a (diff) | |
| parent | 430f319f73894499c56021b70f2827475c3f0433 (diff) | |
| download | bitcoin-3d37ed490a1a90141ead9e393d7739cf6f5afaca.tar.xz | |
Merge bitcoin/bitcoin#29732: depends: qt 5.15.13
430f319f73894499c56021b70f2827475c3f0433 depends: qt 5.15.13 (fanquake)
Pull request description:
I need to try and patch around Qts buildsystem to keep #21778 moving along (the issue being that even when you tell Qt to build using Clang on Linux, it still calls out to GCC, breaking our ability to have a macOS release build env that doesn't have a GCC toolchain installed, and thus no `ld` binary).
Before trying to patch Qt any further, update to the latest LTS release, and update the current patch set.
ACKs for top commit:
TheCharlatan:
Re-ACK 430f319f73894499c56021b70f2827475c3f0433
hebasto:
re-ACK 430f319f73894499c56021b70f2827475c3f0433.
Tree-SHA512: 11122c04d63f4ec79e5d7945e1686eaf308cb1f98c3ff8bc52e265d7353cd4f1a532f4d78d55b43183245aeebf93cc1092087d9fe83e42eefa8a69ad9017d2da
Diffstat (limited to 'depends/patches/qt/memory_resource.patch')
| -rw-r--r-- | depends/patches/qt/memory_resource.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/patches/qt/memory_resource.patch b/depends/patches/qt/memory_resource.patch index 650c328528..312f0669f6 100644 --- a/depends/patches/qt/memory_resource.patch +++ b/depends/patches/qt/memory_resource.patch @@ -17,7 +17,7 @@ and https://bugreports.qt.io/browse/QTBUG-114316 --- a/qtbase/src/corelib/global/qcompilerdetection.h +++ b/qtbase/src/corelib/global/qcompilerdetection.h -@@ -1050,16 +1050,22 @@ +@@ -1055,16 +1055,22 @@ # endif // !_HAS_CONSTEXPR # endif // !__GLIBCXX__ && !_LIBCPP_VERSION # endif // Q_OS_QNX |