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

Fix Windows display version 

The "ReleaseId" key's value stopped updating since
Windows 10 20H2, so we should query the new "DisplayVersion"
key when running on Windows 10 20H2 and onwards.

Change-Id: Ifaa8287f9812126bde0390337af0cda23ff8e529
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Yuhang Zhao 2022-05-20 14:07:54 +08:00
parent f4b7401cdb
commit 182ac2ced4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/corelib/global/qglobal.cpp
View File

@ -2157,9 +2157,14 @@ static QString readVersionRegistryString(const wchar_t *subKey)
.stringValue(subKey);
}
static inline QString windows10ReleaseId()
static inline QString windowsDisplayVersion()
{
return readVersionRegistryString(L"ReleaseId");
// https://tickets.puppetlabs.com/browse/FACT-3058
// The "ReleaseId" key stopped updating since Windows 10 20H2.
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10_20H2)
return readVersionRegistryString(L"DisplayVersion");
else
return readVersionRegistryString(L"ReleaseId");
}
static QString winSp_helper()
@ -2880,9 +2885,9 @@ QString QSysInfo::prettyProductName()
return result + " ("_L1 + versionString + u')';
# else
// (resembling winver.exe): Windows 10 "Windows 10 Version 1809"
const auto releaseId = windows10ReleaseId();
if (!releaseId.isEmpty())
result += " Version "_L1 + releaseId;
const auto displayVersion = windowsDisplayVersion();
if (!displayVersion.isEmpty())
result += " Version "_L1 + displayVersion;
return result;
# endif // Windows
#elif defined(Q_OS_HAIKU)