Update windows version detection

Since the API still doesn't return 11.

Pick-to: 6.2 5.15
Change-Id: Ifd4f7f845915702fcbb0f857487358ae8e806273
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Mårten Nordheim 2021-10-22 13:27:22 +02:00
parent 4c50810a1a
commit 06d2a5cf61
1 changed files with 11 additions and 1 deletions

View File

@ -2215,7 +2215,17 @@ static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSyst
#define Q_WINVER(major, minor) (major << 8 | minor)
switch (Q_WINVER(osver.dwMajorVersion, osver.dwMinorVersion)) {
case Q_WINVER(10, 0):
return workstation ? "10" : "Server 2016";
if (workstation) {
if (osver.dwBuildNumber >= 22000)
return "11";
return "10";
}
// else: Server
if (osver.dwBuildNumber >= 20348)
return "Server 2022";
if (osver.dwBuildNumber >= 17763)
return "Server 2019";
return "Server 2016";
}
#undef Q_WINVER
// unknown, future version