From 19d32f0a5fc8b12e03a84ab6e18845337fd3b70f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 28 Jul 2020 16:45:07 +0200
Subject: Add QOperatingSystemVersion support for macOS Big Sur

Pick-to: 5.15
Pick-to: 5.12

Change-Id: Ide57f675b20b08210f301da5177df45d008423c4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 src/plugins/platforms/cocoa/qcocoahelpers.mm | 85 ----------------------------
 1 file changed, 85 deletions(-)

(limited to 'src/plugins/platforms/cocoa/qcocoahelpers.mm')

diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index cad5979e0f..446c23be81 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -53,9 +53,6 @@
 
 #include <algorithm>
 
-#include <mach-o/dyld.h>
-#include <dlfcn.h>
-
 QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcQpaWindow, "qt.qpa.window");
@@ -368,88 +365,6 @@ QString qt_mac_removeAmpersandEscapes(QString s)
     return QPlatformTheme::removeMnemonics(s).trimmed();
 }
 
-// -------------------------------------------------------------------------
-
-QOperatingSystemVersion QMacVersion::buildSDK(VersionTarget target)
-{
-    switch (target) {
-    case ApplicationBinary: return applicationVersion().second;
-    case QtLibraries: return libraryVersion().second;
-    }
-    Q_UNREACHABLE();
-}
-
-QOperatingSystemVersion QMacVersion::deploymentTarget(VersionTarget target)
-{
-    switch (target) {
-    case ApplicationBinary: return applicationVersion().first;
-    case QtLibraries: return libraryVersion().first;
-    }
-    Q_UNREACHABLE();
-}
-
-QOperatingSystemVersion QMacVersion::currentRuntime()
-{
-    return QOperatingSystemVersion::current();
-}
-
-QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machHeader)
-{
-    static auto makeVersionTuple = [](uint32_t dt, uint32_t sdk) {
-        return qMakePair(
-            QOperatingSystemVersion(QOperatingSystemVersion::MacOS,
-                dt >> 16 & 0xffff, dt >> 8 & 0xff, dt & 0xff),
-            QOperatingSystemVersion(QOperatingSystemVersion::MacOS,
-                sdk >> 16 & 0xffff, sdk >> 8 & 0xff, sdk & 0xff)
-        );
-    };
-
-    auto commandCursor = uintptr_t(machHeader) + sizeof(mach_header_64);
-    for (uint32_t i = 0; i < machHeader->ncmds; ++i) {
-        load_command *loadCommand = reinterpret_cast<load_command *>(commandCursor);
-        if (loadCommand->cmd == LC_VERSION_MIN_MACOSX) {
-            auto versionCommand = reinterpret_cast<version_min_command *>(loadCommand);
-            return makeVersionTuple(versionCommand->version, versionCommand->sdk);
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13)
-        } else if (loadCommand->cmd == LC_BUILD_VERSION) {
-            auto versionCommand = reinterpret_cast<build_version_command *>(loadCommand);
-            return makeVersionTuple(versionCommand->minos, versionCommand->sdk);
-#endif
-        }
-        commandCursor += loadCommand->cmdsize;
-    }
-    Q_ASSERT_X(false, "QCocoaIntegration", "Could not find any version load command");
-    Q_UNREACHABLE();
-}
-
-QMacVersion::VersionTuple QMacVersion::applicationVersion()
-{
-    static VersionTuple version = []() {
-        const mach_header *executableHeader = nullptr;
-        for (uint32_t i = 0; i < _dyld_image_count(); ++i) {
-            auto header = _dyld_get_image_header(i);
-            if (header->filetype == MH_EXECUTE) {
-                executableHeader = header;
-                break;
-            }
-        }
-        Q_ASSERT_X(executableHeader, "QCocoaIntegration", "Failed to resolve Mach-O header of executable");
-        return versionsForImage(executableHeader);
-    }();
-    return version;
-}
-
-QMacVersion::VersionTuple QMacVersion::libraryVersion()
-{
-    static VersionTuple version = []() {
-        Dl_info cocoaPluginImage;
-        dladdr((const void *)&QMacVersion::libraryVersion, &cocoaPluginImage);
-        Q_ASSERT_X(cocoaPluginImage.dli_fbase, "QCocoaIntegration", "Failed to resolve Mach-O header of Cocoa plugin");
-        return versionsForImage(static_cast<mach_header*>(cocoaPluginImage.dli_fbase));
-    }();
-    return version;
-}
-
 QT_END_NAMESPACE
 
 /*! \internal
-- 
cgit v1.2.3