amass/qt-build-tools
1
0
Fork 0
mirror of https://github.com/crystalidea/qt-build-tools.git synced 2024-11-22 19:00:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

5.15.14 - backport of fix for https://bugreports.qt.io/browse/QTBUG-117484

Browse Source
This commit is contained in:
kleuter 2023-10-04 10:22:06 +02:00
parent f943376bb1
commit fffd3d4b0a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
5.15.14/qtbase/src/corelib/global/qcompilerdetection.h
View File

@ -1065,6 +1065,11 @@
// Also disable <atomic>, since it's clearly not there // Also disable <atomic>, since it's clearly not there
# undef Q_COMPILER_ATOMICS # undef Q_COMPILER_ATOMICS
# endif # endif
# if defined(Q_CC_CLANG) && defined(Q_OS_MAC) && 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
# if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500 # 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 // 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 // (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some

2
5.15.14/qtbase/src/corelib/tools/qduplicatetracker_p.h
View File

@ -52,7 +52,7 @@
#include <qglobal.h> #include <qglobal.h>
#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L #ifdef __cpp_lib_memory_resource
# include <unordered_set> # include <unordered_set>
# include <memory_resource> # include <memory_resource>
#else #else