diff options
| -rw-r--r-- | src/envwindows.cpp | 13 | ||||
| -rw-r--r-- | src/envwindows.h | 6 |
2 files changed, 5 insertions, 14 deletions
diff --git a/src/envwindows.cpp b/src/envwindows.cpp index 98e78a3e..a2019fab 100644 --- a/src/envwindows.cpp +++ b/src/envwindows.cpp @@ -94,11 +94,6 @@ QString WindowsInfo::toString() const sl.push_back(m_release.buildLab); } - // product name - if (!m_release.productName.isEmpty()) { - sl.push_back(m_release.productName); - } - // elevated QString elevated = "?"; if (m_elevated.has_value()) { @@ -187,11 +182,11 @@ WindowsInfo::Release WindowsInfo::getRelease() const } } - // localized name of windows, such as "Windows 10 Pro" - r.productName = settings.value("ProductName", "").toString(); - // release ID, such as 1803 - r.ID = settings.value("ReleaseId", "").toString(); + r.ID = settings.value("DisplayVersion", "").toString(); + if (r.ID.isEmpty()) { + r.ID = settings.value("ReleaseId", "").toString(); + } // some other build number, shown in winver.exe r.UBR = settings.value("UBR", 0).toUInt(); diff --git a/src/envwindows.h b/src/envwindows.h index 90655e49..61ef609d 100644 --- a/src/envwindows.h +++ b/src/envwindows.h @@ -40,11 +40,7 @@ public: // the BuildLab entry from the registry, may be empty QString buildLab; - // product name such as "Windows 10 Pro", may not be in English, may be - // empty - QString productName; - - // release ID such as 1809, may be mepty + // release ID such as 1809, may be empty QString ID; // some sub-build number, undocumented, may be empty |