diff options
author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-04-11 15:16:09 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-12 18:48:57 +0200 |
commit | 17412400dc2887ccd52014a9c261c6ab1da44e01 (patch) | |
tree | bc70f8ef78a5e357e1a07add436e79892461f110 /src/corelib/global | |
parent | dae4bd8489993a250cfd7890ec963bf8190a7a97 (diff) |
Add OS version detection for windows 8
Based on consumer preview, the internal version is 6.2
Change-Id: I9d6ff6c7614f46a20d489e8a8f4aefeb60c547f6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/qglobal.cpp | 4 | ||||
-rw-r--r-- | src/corelib/global/qsysinfo.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 7d518cbcd8..ac0f27d397 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1711,6 +1711,8 @@ QSysInfo::WinVersion QSysInfo::windowsVersion() winver = QSysInfo::WV_VISTA; } else if (osver.dwMajorVersion == 6 && osver.dwMinorVersion == 1) { winver = QSysInfo::WV_WINDOWS7; + } else if (osver.dwMajorVersion == 6 && osver.dwMinorVersion == 2) { + winver = QSysInfo::WV_WINDOWS8; } else { qWarning("Qt: Untested Windows version %d.%d detected!", int(osver.dwMajorVersion), int(osver.dwMinorVersion)); @@ -1742,6 +1744,8 @@ QSysInfo::WinVersion QSysInfo::windowsVersion() winver = QSysInfo::WV_VISTA; else if (override == "WINDOWS7") winver = QSysInfo::WV_WINDOWS7; + else if (override == "WINDOWS8") + winver = QSysInfo::WV_WINDOWS8; } #endif diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index 74c8d1de7f..2c9ce39430 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -96,6 +96,7 @@ public: WV_2003 = 0x0040, WV_VISTA = 0x0080, WV_WINDOWS7 = 0x0090, + WV_WINDOWS8 = 0x00a0, WV_NT_based = 0x00f0, /* version numbers */ @@ -105,6 +106,7 @@ public: WV_5_2 = WV_2003, WV_6_0 = WV_VISTA, WV_6_1 = WV_WINDOWS7, + WV_6_2 = WV_WINDOWS8, WV_CE = 0x0100, WV_CENET = 0x0200, |