Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15

Change-Id: Ie9df84af22570d601db002e391a1a0d97e7cd9e1

1 files changed, 8 insertions, 0 deletions

diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm
index 99ad4ce666..0b64deff4b 100644
--- a/src/corelib/kernel/qcore_mac.mm
+++ b/src/corelib/kernel/qcore_mac.mm
@@ -606,6 +606,14 @@ void qt_apple_check_os_version()
     const NSOperatingSystemVersion required = (NSOperatingSystemVersion){
         version / 10000, version / 100 % 100, version % 100};
     const NSOperatingSystemVersion current = NSProcessInfo.processInfo.operatingSystemVersion;
+
+#if defined(Q_OS_MACOS)
+    // Check for compatibility version, in which case we can't do a
+    // comparison to the deployment target, which might be e.g. 11.0
+    if (current.majorVersion == 10 && current.minorVersion >= 16)
+        return; // FIXME: Find a way to detect the real OS version
+#endif
+
     if (![NSProcessInfo.processInfo isOperatingSystemAtLeastVersion:required]) {
         NSDictionary *plist = NSBundle.mainBundle.infoDictionary;
         NSString *applicationName = plist[@"CFBundleDisplayName"];