diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-12-19 09:58:34 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-01-10 17:14:16 (GMT) |
| commit | 50223ce5eebfdff01a88474f0589259137997458 (patch) | |
| tree | cd099288b8b1b43c521f6eb8940b321b8818e148 | |
| parent | 6f55f3dbbb2cdae33a8b0d00b7bf2ada7fe79a04 (diff) | |
| download | Qt-50223ce5eebfdff01a88474f0589259137997458.zip Qt-50223ce5eebfdff01a88474f0589259137997458.tar.gz Qt-50223ce5eebfdff01a88474f0589259137997458.tar.bz2 | |
Introduce Windows version 10.
Detect OS kernel version 10.0 as Windows 10.
Task-number: QTBUG-43413
Change-Id: I39307cf8cc2e7cc209d6a88b8576db87086fa20e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from qtbase/b495a27d4e28ed19b00557dbaf8ab5d31c21ae4f)
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index e46894c..5d346b5 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1139,6 +1139,7 @@ bool qSharedBuild() \value WV_WINDOWS7 Windows 7, Windows Server 2008 R2 (operating system version 6.1) \value WV_WINDOWS8 Windows 8 (operating system version 6.2) \value WV_WINDOWS8_1 Windows 8.1 (operating system version 6.3), introduced in Qt 4.8.6 + \value WV_WINDOWS10 Windows 10 (operating system version 10.0), introduced in Qt 4.8.7 Alternatively, you may use the following macros which correspond directly to the Windows operating system version number: @@ -1150,6 +1151,7 @@ bool qSharedBuild() \value WV_6_1 Operating system version 6.1, corresponds to Windows 7 and Windows Server 2008 R2 \value WV_6_2 Operating system version 6.2, corresponds to Windows 8 \value WV_6_3 Operating system version 6.3, corresponds to Windows 8.1, introduced in Qt 4.8.6 + \value WV_10_0 Operating system version 10.0, corresponds to Windows 10, introduced in Qt 4.8.7 CE-based versions: @@ -1845,6 +1847,8 @@ QSysInfo::WinVersion QSysInfo::windowsVersion() winver = QSysInfo::WV_WINDOWS8; } else if (osver.dwMajorVersion == 6 && osver.dwMinorVersion == 3) { winver = QSysInfo::WV_WINDOWS8_1; + } else if (osver.dwMajorVersion == 10 && osver.dwMinorVersion == 0) { + winver = QSysInfo::WV_WINDOWS10; } else { qWarning("Qt: Untested Windows version %d.%d detected!", int(osver.dwMajorVersion), int(osver.dwMinorVersion)); diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 5e28aa6..39dc8a0 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1703,6 +1703,7 @@ public: WV_WINDOWS7 = 0x0090, WV_WINDOWS8 = 0x00a0, WV_WINDOWS8_1 = 0x00b0, + WV_WINDOWS10 = 0x00c0, WV_NT_based = 0x00f0, /* version numbers */ @@ -1714,6 +1715,7 @@ public: WV_6_1 = WV_WINDOWS7, WV_6_2 = WV_WINDOWS8, WV_6_3 = WV_WINDOWS8_1, + WV_10_0 = WV_WINDOWS10, WV_CE = 0x0100, WV_CENET = 0x0200, |