mirror of
https://github.com/Rockbox/rockbox.git
synced 2026-07-10 13:29:52 -04:00
rbutilqt: Switch to a Qt API to get macOS version number, get system architecture using a compiler macro
This removes usage of the deprecated macOS Gestalt() API (2/2) Co-authored-by: ChatGPT (GPT-5.3 Mini) <chatgpt@openai.com> Change-Id: Id10386285469c06f082a7dcdcc3284b97519b10a
This commit is contained in:
parent
1cbf61607e
commit
dcc997e4e4
1 changed files with 14 additions and 25 deletions
|
|
@ -192,33 +192,22 @@ QString System::osVersionString(void)
|
|||
result = QString("(Error when retrieving system information)");
|
||||
}
|
||||
#if defined(Q_OS_MACOS)
|
||||
SInt32 major;
|
||||
SInt32 minor;
|
||||
SInt32 bugfix;
|
||||
Gestalt(gestaltSystemVersionMajor, &major);
|
||||
Gestalt(gestaltSystemVersionMinor, &minor);
|
||||
Gestalt(gestaltSystemVersionBugFix, &bugfix);
|
||||
auto ver = QOperatingSystemVersion::current();
|
||||
|
||||
result += QString("<br/>OS X %1.%2.%3 ").arg(major).arg(minor).arg(bugfix);
|
||||
// 1: 86k, 2: ppc, 10: i386
|
||||
SInt32 arch;
|
||||
Gestalt(gestaltSysArchitecture, &arch);
|
||||
switch(arch) {
|
||||
case 1:
|
||||
result.append("(86k)");
|
||||
break;
|
||||
case 2:
|
||||
result.append("(ppc)");
|
||||
break;
|
||||
case 10:
|
||||
result.append("(x86)");
|
||||
break;
|
||||
default:
|
||||
result.append("(unknown)");
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
result += QString("<br/>macOS %1.%2.%3")
|
||||
.arg(ver.majorVersion())
|
||||
.arg(ver.minorVersion())
|
||||
.arg(ver.microVersion());
|
||||
|
||||
#if defined(__arm64__)
|
||||
result += " (arm64)";
|
||||
#elif defined(__x86_64__)
|
||||
result += " (x86_64)";
|
||||
#else
|
||||
result += " (unknown)";
|
||||
#endif
|
||||
#endif /* defined(Q_OS_MACOS) */
|
||||
#endif /* defined(Q_OS_LINUX) || defined(Q_OS_MACOS) */
|
||||
result += QString("<br/>Qt version %1").arg(qVersion());
|
||||
return result;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue