summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qoperatingsystemversion_win.cpp
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2020-11-02 07:00:18 +0100
committerOliver Wolff <oliver.wolff@qt.io>2021-07-30 08:02:56 +0200
commit5f5c342924a0d9a2856b2f2d6db373e25723f2b0 (patch)
tree5a0c95642e83b46a91e7af735df0644287afab7b /src/corelib/global/qoperatingsystemversion_win.cpp
parent2c6bc06267b2599d491d5c84b29a368e6a922bc1 (diff)
Diffstat (limited to 'src/corelib/global/qoperatingsystemversion_win.cpp')
-rw-r--r--src/corelib/global/qoperatingsystemversion_win.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/corelib/global/qoperatingsystemversion_win.cpp b/src/corelib/global/qoperatingsystemversion_win.cpp
index eb58b60788..c514aaf54d 100644
--- a/src/corelib/global/qoperatingsystemversion_win.cpp
+++ b/src/corelib/global/qoperatingsystemversion_win.cpp
@@ -90,25 +90,13 @@ OSVERSIONINFOEX qWindowsVersionInfo()
result.wServicePackMinor = 0;
const QByteArray winVerOverride = qgetenv("QT_WINVER_OVERRIDE");
- if (winVerOverride == "WINDOWS7" || winVerOverride == "2008_R2") {
- result.dwMajorVersion = 6;
- result.dwMinorVersion = 1;
- } else if (winVerOverride == "WINDOWS8" || winVerOverride == "2012") {
- result.dwMajorVersion = 6;
- result.dwMinorVersion = 2;
- } else if (winVerOverride == "WINDOWS8_1" || winVerOverride == "2012_R2") {
- result.dwMajorVersion = 6;
- result.dwMinorVersion = 3;
- } else if (winVerOverride == "WINDOWS10" || winVerOverride == "2016") {
+ if (winVerOverride == "WINDOWS10" || winVerOverride == "2016") {
result.dwMajorVersion = 10;
} else {
return realResult;
}
- if (winVerOverride == "2008_R2"
- || winVerOverride == "2012"
- || winVerOverride == "2012_R2"
- || winVerOverride == "2016") {
+ if (winVerOverride == "2016") {
// If the current host OS is a domain controller and the override OS
// is also a server type OS, preserve that information
if (result.wProductType == VER_NT_WORKSTATION)