AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve SDK and deployment target OS from load command

Browse Source 
Pick-to: 5.15
Pick-to: 5.12
Change-Id: Icce79186645f173b7f9be8ee6da0abed25cf3da0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-08-03 18:03:12 +02:00
parent c580a5cdd4
commit 4e74bb4823
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/corelib/kernel/qcore_mac.mm
View File

@ -566,12 +566,30 @@ QOperatingSystemVersion QMacVersion::currentRuntime()
QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machHeader) QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machHeader)
{ {
static auto makeVersionTuple = [](uint32_t dt, uint32_t sdk) { static auto osForLoadCommand = [](uint32_t cmd) {
switch (cmd) {
case LC_VERSION_MIN_MACOSX: return QOperatingSystemVersion::MacOS;
case LC_VERSION_MIN_IPHONEOS: return QOperatingSystemVersion::IOS;
case LC_VERSION_MIN_TVOS: return QOperatingSystemVersion::TvOS;
case LC_VERSION_MIN_WATCHOS: return QOperatingSystemVersion::WatchOS;
default: return QOperatingSystemVersion::Unknown;
}
};
static auto osForPlatform = [](uint32_t platform) {
switch (platform) {
case 1: return QOperatingSystemVersion::MacOS;
case 2: return QOperatingSystemVersion::IOS;
case 3: return QOperatingSystemVersion::TvOS;
case 4: return QOperatingSystemVersion::WatchOS;
default: return QOperatingSystemVersion::Unknown;
}
};
static auto makeVersionTuple = [](uint32_t dt, uint32_t sdk, QOperatingSystemVersion::OSType osType) {
return qMakePair( return qMakePair(
QOperatingSystemVersion(QOperatingSystemVersion::currentType(), QOperatingSystemVersion(osType, dt >> 16 & 0xffff, dt >> 8 & 0xff, dt & 0xff),
dt >> 16 & 0xffff, dt >> 8 & 0xff, dt & 0xff), QOperatingSystemVersion(osType, sdk >> 16 & 0xffff, sdk >> 8 & 0xff, sdk & 0xff)
QOperatingSystemVersion(QOperatingSystemVersion::currentType(),
sdk >> 16 & 0xffff, sdk >> 8 & 0xff, sdk & 0xff)
); );
}; };
@ -581,11 +599,11 @@ QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machH
if (loadCommand->cmd == LC_VERSION_MIN_MACOSX || loadCommand->cmd == LC_VERSION_MIN_IPHONEOS if (loadCommand->cmd == LC_VERSION_MIN_MACOSX || loadCommand->cmd == LC_VERSION_MIN_IPHONEOS
|| loadCommand->cmd == LC_VERSION_MIN_TVOS || loadCommand->cmd == LC_VERSION_MIN_WATCHOS) { || loadCommand->cmd == LC_VERSION_MIN_TVOS || loadCommand->cmd == LC_VERSION_MIN_WATCHOS) {
auto versionCommand = reinterpret_cast<version_min_command *>(loadCommand); auto versionCommand = reinterpret_cast<version_min_command *>(loadCommand);
return makeVersionTuple(versionCommand->version, versionCommand->sdk); return makeVersionTuple(versionCommand->version, versionCommand->sdk, osForLoadCommand(loadCommand->cmd));
#if QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13, __IPHONE_11_0, __TVOS_11_0, __WATCHOS_4_0) #if QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13, __IPHONE_11_0, __TVOS_11_0, __WATCHOS_4_0)
} else if (loadCommand->cmd == LC_BUILD_VERSION) { } else if (loadCommand->cmd == LC_BUILD_VERSION) {
auto versionCommand = reinterpret_cast<build_version_command *>(loadCommand); auto versionCommand = reinterpret_cast<build_version_command *>(loadCommand);
return makeVersionTuple(versionCommand->minos, versionCommand->sdk); return makeVersionTuple(versionCommand->minos, versionCommand->sdk, osForPlatform(versionCommand->platform));
#endif #endif
} }
commandCursor += loadCommand->cmdsize; commandCursor += loadCommand->cmdsize;