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

…17484
crystalidea · Oct 4, 2023 · fffd3d4 · fffd3d4
1 parent f943376
commit fffd3d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/5.15.14/qtbase/src/corelib/global/qcompilerdetection.h b/5.15.14/qtbase/src/corelib/global/qcompilerdetection.h
@@ -1065,6 +1065,11 @@
 // Also disable <atomic>, since it's clearly not there
 #  undef Q_COMPILER_ATOMICS
 # 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
 // 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

diff --git a/5.15.14/qtbase/src/corelib/tools/qduplicatetracker_p.h b/5.15.14/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