summaryrefslogtreecommitdiffstats
path: root/qmake/library/qmakeevaluator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/library/qmakeevaluator.cpp')
-rw-r--r--qmake/library/qmakeevaluator.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp
index 017fc3434c..fd24cf209d 100644
--- a/qmake/library/qmakeevaluator.cpp
+++ b/qmake/library/qmakeevaluator.cpp
@@ -1031,21 +1031,8 @@ void QMakeEvaluator::loadDefaults()
if (GetComputerName(name, &name_length))
vars[ProKey("QMAKE_HOST.name")] << ProString(QString::fromWCharArray(name));
- QSysInfo::WinVersion ver = QSysInfo::WindowsVersion;
- vars[ProKey("QMAKE_HOST.version")] << ProString(QString::number(ver));
- ProString verStr;
- switch (ver) {
- case QSysInfo::WV_Me: verStr = ProString("WinMe"); break;
- case QSysInfo::WV_95: verStr = ProString("Win95"); break;
- case QSysInfo::WV_98: verStr = ProString("Win98"); break;
- case QSysInfo::WV_NT: verStr = ProString("WinNT"); break;
- case QSysInfo::WV_2000: verStr = ProString("Win2000"); break;
- case QSysInfo::WV_2003: verStr = ProString("Win2003"); break;
- case QSysInfo::WV_XP: verStr = ProString("WinXP"); break;
- case QSysInfo::WV_VISTA: verStr = ProString("WinVista"); break;
- default: verStr = ProString("Unknown"); break;
- }
- vars[ProKey("QMAKE_HOST.version_string")] << verStr;
+ vars[ProKey("QMAKE_HOST.version")] << ProString(QSysInfo::kernelVersion());
+ vars[ProKey("QMAKE_HOST.version_string")] << ProString(QSysInfo::productVersion());
SYSTEM_INFO info;
GetSystemInfo(&info);