summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-07-27 11:45:20 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-07-27 11:46:13 (GMT)
commit14c96b7079a0fb32d1c32d00f95a87e0e3ada8b6 (patch)
treee45b6d646780f1504e129970d403fc0c174f5cbd /src
parentebaae9e6a8694d6be4ec5c353a98d532e133245a (diff)
downloadQt-14c96b7079a0fb32d1c32d00f95a87e0e3ada8b6.zip
Qt-14c96b7079a0fb32d1c32d00f95a87e0e3ada8b6.tar.gz
Qt-14c96b7079a0fb32d1c32d00f95a87e0e3ada8b6.tar.bz2
Add docs for Windows Server 2008 R2 to QSysInfo::WinVersion
Windows Server 2008 R2 is based on kernel 6.1, the same as Windows 7. Reviewed-by: TrustMe
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qglobal.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 48116b8..d15c102 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1079,7 +1079,7 @@ bool qSharedBuild()
\value WV_XP Windows XP (operating system version 5.1)
\value WV_2003 Windows Server 2003, Windows Server 2003 R2, Windows Home Server, Windows XP Professional x64 Edition (operating system version 5.2)
\value WV_VISTA Windows Vista, Windows Server 2008 (operating system version 6.0)
- \value WV_WINDOWS7 Windows 7 (operating system version 6.1)
+ \value WV_WINDOWS7 Windows 7, Windows Server 2008 R2 (operating system version 6.1)
Alternatively, you may use the following macros which correspond directly to the Windows operating system version number:
@@ -1088,7 +1088,7 @@ bool qSharedBuild()
\value WV_5_1 Operating system version 5.1, corresponds to Windows XP
\value WV_5_2 Operating system version 5.2, corresponds to Windows Server 2003, Windows Server 2003 R2, Windows Home Server, and Windows XP Professional x64 Edition
\value WV_6_0 Operating system version 6.0, corresponds to Windows Vista and Windows Server 2008
- \value WV_6_1 Operating system version 6.1, corresponds to Windows 7
+ \value WV_6_1 Operating system version 6.1, corresponds to Windows 7 and Windows Server 2008 R2
CE-based versions: