Apple: Add QT_APPLE_SDK_EQUAL_OR_ABOVE for explicit SDK checks

QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE and its per-platform wrappers
take a fixed, positional argument list, so a call has to fill the
platforms it doesn't care about with __MAC_NA and friends, and the
reader has to remember which slot is which. We were also missing
handling for visionOS.

QT_APPLE_SDK_EQUAL_OR_ABOVE names each platform explicitly and takes
them in any order, listing only the ones that matter:

  #if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(26), IOS(17, 2), VISIONOS(2))

The version is given in one to three parts, e.g. IOS(17), IOS(17, 2)
or IOS(17, 2, 1), and expanded to the encoding the
__..._VERSION_MAX_ALLOWED macros already use. The platform headers
take care of defining __..._VERSION_MAX_ALLOWED appropriately per
platform, so we don't need additional Q_OS_... guards. In fact
adding these would prevent IOS(17) from being true on visionOS,
which does inherit its API surface from iOS 17.

The in-tree callers are moved over, and the old
QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE base macro is deprecated. That
also covers the per-platform wrappers, since they expand through it.

Pick-to: 6.12
Change-Id: Ie71f58b314e45de949716216c4f1e814cc4e4847
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

Author: torarnv

src/corelib/global/qsystemdetection.h

@@ -182,6 +182,7 @@
 #ifdef Q_OS_DARWIN
 #  include <Availability.h>
 #  include <AvailabilityMacros.h>
+#  include <QtCore/qtpreprocessorsupport.h>
 
 #  define QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, ios, tvos, watchos) \
     ((defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && macos != __MAC_NA && __MAC_OS_X_VERSION_MAX_ALLOWED >= macos) || \
@@ -206,6 +207,8 @@
 #  define QT_WATCHOS_PLATFORM_SDK_EQUAL_OR_ABOVE(watchos) \
       QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_NA, __IPHONE_NA, __TVOS_NA, watchos)
 
+#  pragma clang deprecated(QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE, "Use QT_APPLE_SDK_EQUAL_OR_ABOVE instead")
+
 #  define QT_MACOS_IOS_DEPLOYMENT_TARGET_BELOW(macos, ios) \
       QT_DARWIN_DEPLOYMENT_TARGET_BELOW(macos, ios, __TVOS_NA, __WATCHOS_NA)
 #  define QT_MACOS_DEPLOYMENT_TARGET_BELOW(macos) \
@@ -219,6 +222,50 @@
 
 #  pragma clang deprecated(QT_DARWIN_DEPLOYMENT_TARGET_BELOW, "Use @available instead")
 
+/*!
+    \macro QT_APPLE_SDK_EQUAL_OR_ABOVE
+    \internal
+
+    Generalized Apple platform SDK check, for code requiring
+    a minimum version of build SDK, e.g.:
+
+      #if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(26, 6, 1), IOS(17, 2), VISIONOS(2))
+
+    For runtime version checks, use @available
+*/
+
+#  define QT_APPLE_SDK_VERSION(...) QT_APPLE_SDK_VERSION_IMPL(__VA_ARGS__, 0, 0)
+#  define QT_APPLE_SDK_VERSION_IMPL(major, minor, patch, ...) \
+      ((major) * 10000 + (minor) * 100 + (patch))
+
+#  define QT_APPLE_SDK_PLATFORM_MACOS(...) \
+      (__MAC_OS_X_VERSION_MAX_ALLOWED >= QT_APPLE_SDK_VERSION(__VA_ARGS__))
+#  define QT_APPLE_SDK_PLATFORM_IOS(...) \
+      (__IPHONE_OS_VERSION_MAX_ALLOWED >= QT_APPLE_SDK_VERSION(__VA_ARGS__))
+#  define QT_APPLE_SDK_PLATFORM_TVOS(...) \
+      (__TV_OS_VERSION_MAX_ALLOWED >= QT_APPLE_SDK_VERSION(__VA_ARGS__))
+#  define QT_APPLE_SDK_PLATFORM_WATCHOS(...) \
+      (__WATCH_OS_VERSION_MAX_ALLOWED >= QT_APPLE_SDK_VERSION(__VA_ARGS__))
+#  define QT_APPLE_SDK_PLATFORM_VISIONOS(...) \
+      (__VISION_OS_VERSION_MAX_ALLOWED >= QT_APPLE_SDK_VERSION(__VA_ARGS__))
+
+#  define QT_APPLE_SDK_EQUAL_OR_ABOVE_1(p1) \
+      (QT_APPLE_SDK_PLATFORM_##p1)
+#  define QT_APPLE_SDK_EQUAL_OR_ABOVE_2(p1, p2) \
+      (QT_APPLE_SDK_PLATFORM_##p1 || QT_APPLE_SDK_PLATFORM_##p2)
+#  define QT_APPLE_SDK_EQUAL_OR_ABOVE_3(p1, p2, p3) \
+      (QT_APPLE_SDK_PLATFORM_##p1 || QT_APPLE_SDK_PLATFORM_##p2 \
+       || QT_APPLE_SDK_PLATFORM_##p3)
+#  define QT_APPLE_SDK_EQUAL_OR_ABOVE_4(p1, p2, p3, p4) \
+      (QT_APPLE_SDK_PLATFORM_##p1 || QT_APPLE_SDK_PLATFORM_##p2 \
+       || QT_APPLE_SDK_PLATFORM_##p3 || QT_APPLE_SDK_PLATFORM_##p4)
+#  define QT_APPLE_SDK_EQUAL_OR_ABOVE_5(p1, p2, p3, p4, p5) \
+      (QT_APPLE_SDK_PLATFORM_##p1 || QT_APPLE_SDK_PLATFORM_##p2 \
+       || QT_APPLE_SDK_PLATFORM_##p3 || QT_APPLE_SDK_PLATFORM_##p4 \
+       || QT_APPLE_SDK_PLATFORM_##p5)
+
+#  define QT_APPLE_SDK_EQUAL_OR_ABOVE(...) QT_OVERLOADED_MACRO(QT_APPLE_SDK_EQUAL_OR_ABOVE, __VA_ARGS__)
+
 #else // !Q_OS_DARWIN
 
 #define QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, ios, tvos, watchos) (0)
@@ -227,6 +274,7 @@
 #define QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(ios) (0)
 #define QT_TVOS_PLATFORM_SDK_EQUAL_OR_ABOVE(tvos) (0)
 #define QT_WATCHOS_PLATFORM_SDK_EQUAL_OR_ABOVE(watchos) (0)
+#define QT_APPLE_SDK_EQUAL_OR_ABOVE(...) (0)
 
 #endif // Q_OS_DARWIN
 

src/corelib/platform/darwin/qdarwinpermissionplugin_contacts.mm

@@ -21,7 +21,7 @@ @implementation QDarwinContactsPermissionHandler
     const auto status = [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts];
     switch (status) {
     case CNAuthorizationStatusAuthorized:
-#if (defined(Q_OS_IOS) && QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(180000)) || defined(Q_OS_VISIONOS)
+#if (defined(Q_OS_IOS) && QT_APPLE_SDK_EQUAL_OR_ABOVE(IOS(18))) || defined(Q_OS_VISIONOS)
     case CNAuthorizationStatusLimited:
 #endif
         return Qt::PermissionStatus::Granted;

src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm

@@ -836,7 +836,7 @@ - (NSInteger) accessibilityInsertionPointLineNumber {
 - (NSArray *)accessibilityAttributeNames {
     NSMutableArray *attributes = [[NSMutableArray new] autorelease];
 
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(260000)
+#if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(26))
     if (@available(macOS 26, *))
         [attributes addObject:NSAccessibilityLanguageAttribute];
 #endif
@@ -855,7 +855,7 @@ - (id)accessibilityAttributeValue:(NSString *)attribute {
         return nil;
     }
 
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(260000)
+#if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(26))
     if (@available(macOS 26, *)) {
         if ([attribute isEqualToString:NSAccessibilityLanguageAttribute]) {
             QAccessibleAttributesInterface *attributesIface = iface->attributesInterface();

src/plugins/platforms/cocoa/qcocoacursor.mm

@@ -155,7 +155,7 @@ + (id)_windowResizeEastWestCursor;
     case Qt::SizeHorCursor:
     case Qt::SizeBDiagCursor:
     case Qt::SizeFDiagCursor: {
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000)
+#if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(15))
         if (@available(macOS 15, *)) {
             auto position = [newShape]{
                 switch (newShape) {

src/plugins/platforms/cocoa/qnsview.mm

@@ -86,7 +86,7 @@ @interface QNSView (ComplexText) <NSTextInputClient>
 @interface QNSView (ServicesMenu) <NSServicesMenuRequestor>
 @end
 
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000)
+#if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(15))
 @interface QNSView (ContentSelectionInfo) <NSViewContentSelectionInfo>
 @end
 #endif

src/plugins/platforms/cocoa/qnsview_complextext.mm

@@ -794,7 +794,7 @@ - (QString)utiForPasteboardType:(NSPasteboardType)pasteboardType
 
 @end
 
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000)
+#if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(15))
 @implementation QNSView (ContentSelectionInfo)
 
 /*

src/plugins/platforms/cocoa/qnsview_keys.mm

@@ -254,7 +254,7 @@ - (void)flagsChanged:(NSEvent *)nsevent
     }
 }
 
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000)
+#if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(15))
 - (void)contextMenuKeyDown:(NSEvent *)nsevent
 {
     qCDebug(lcQpaKeys) << "Handling context menu key down for" << nsevent;

src/plugins/platforms/cocoa/qnsview_menus.mm

@@ -40,7 +40,7 @@ - (id)supplementalTargetForAction:(SEL)action sender:(id)sender
     return [super supplementalTargetForAction:action sender:sender];
 }
 
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000)
+#if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(15))
 - (void)showContextMenuForSelection:(id)sender
 {
     QPointF windowPoint;

src/plugins/tls/securetransport/qtls_st.cpp

@@ -820,7 +820,7 @@ bool TlsCryptographSecureTransport::setSessionCertificate(QString &errorDescript
         const void *values[2] = { password };
         CFIndex nKeys = 1;
 #ifdef Q_OS_MACOS
-#if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000, 180000)
+#if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(15), IOS(18))
         // Starting from macOS 15 our temporary keychain is ignored.
         // We have to use kSecImportToMemoryOnly/kCFBooleanTrue key/value
         // instead. This key is "memory" but looks like Security framework

src/testlib/qtesthelpers_p.h

@@ -142,7 +142,7 @@ inline bool isSecureTransportBlockingTest()
 #ifdef Q_OS_MACOS
 #if QT_CONFIG(ssl)
     if (QSslSocket::activeBackend() == QLatin1String("securetransport")) {
-#if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000, 180000)
+#if QT_APPLE_SDK_EQUAL_OR_ABOVE(MACOS(15), IOS(18))
         // Starting from macOS 15 our temporary keychain is ignored.
         // We have to use kSecImportToMemoryOnly/kCFBooleanTrue key/value
         // instead. This way we don't have to use QT_SSL_USE_TEMPORARY_KEYCHAIN anymore.