whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle simulator platforms when parsing LC_BUILD_VERSION load command 

Task-number: QTBUG-85764
Pick-to: 5.15
Pick-to: 5.12
Change-Id: Ie46bee0937908e2dfedfa3532394dde015abf891
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Tor Arne Vestbø 2020-08-06 18:12:30 +02:00
parent 8191a19df4
commit 3911be6160
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,6 +564,19 @@ QOperatingSystemVersion QMacVersion::currentRuntime()
return QOperatingSystemVersion::current();
}
// Mach-O platforms
enum Platform {
macOS = 1,
iOS = 2,
tvOS = 3,
watchOS = 4,
bridgeOS = 5,
macCatalyst = 6,
iOSSimulator = 7,
tvOSSimulator = 8,
watchOSSimulator = 9
};
QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machHeader)
{
static auto osForLoadCommand = [](uint32_t cmd) {
@ -578,11 +591,19 @@ QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machH
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;
case Platform::macOS:
return QOperatingSystemVersion::MacOS;
case Platform::iOS:
case Platform::iOSSimulator:
return QOperatingSystemVersion::IOS;
case Platform::tvOS:
case Platform::tvOSSimulator:
return QOperatingSystemVersion::TvOS;
case Platform::watchOS:
case Platform::watchOSSimulator:
return QOperatingSystemVersion::WatchOS;
default:
return QOperatingSystemVersion::Unknown;
}
};