AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QOperatingSystemVersion: Add Win10 sub-versions

Browse Source 
Change-Id: Icce32a17f285f0a0416ad8a7838a7424cda2bc2b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Yuhang Zhao 2021-11-13 20:10:06 +08:00
parent 79b2a43585
commit 16aa4eaa82
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/corelib/global/qoperatingsystemversion.cpp
View File

@ -424,6 +424,48 @@ const QOperatingSystemVersion QOperatingSystemVersion::Windows8_1 =
const QOperatingSystemVersion QOperatingSystemVersion::Windows10 =
QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10);
/*!
\variable QOperatingSystemVersion::Windows10_1809
\brief a version corresponding to Windows 10 1809 (version 10.0.17763).
\since 6.3
*/
/*!
\variable QOperatingSystemVersion::Windows10_1903
\brief a version corresponding to Windows 10 1903 (version 10.0.18362).
\since 6.3
*/
/*!
\variable QOperatingSystemVersion::Windows10_1909
\brief a version corresponding to Windows 10 1909 (version 10.0.18363).
\since 6.3
*/
/*!
\variable QOperatingSystemVersion::Windows10_2004
\brief a version corresponding to Windows 10 2004 (version 10.0.19041).
\since 6.3
*/
/*!
\variable QOperatingSystemVersion::Windows10_20H2
\brief a version corresponding to Windows 10 20H2 (version 10.0.19042).
\since 6.3
*/
/*!
\variable QOperatingSystemVersion::Windows10_21H1
\brief a version corresponding to Windows 10 21H1 (version 10.0.19043).
\since 6.3
*/
/*!
\variable QOperatingSystemVersion::Windows10_21H2
\brief a version corresponding to Windows 10 21H2 (version 10.0.19044).
\since 6.3
*/
/*!
\variable QOperatingSystemVersion::OSXMavericks
\brief a version corresponding to OS X Mavericks (version 10.9).

8
src/corelib/global/qoperatingsystemversion.h
View File

@ -221,6 +221,14 @@ public:
static constexpr QOperatingSystemVersionBase Android11 { QOperatingSystemVersionBase::Android, 11, 0 };
#endif // New (static constexpr) entries go here, only cherry-pick as far back as 6.3 (QTBUG-97808):
static constexpr QOperatingSystemVersionBase Windows10_1809 { QOperatingSystemVersionBase::Windows, 10, 0, 17763 }; // RS5
static constexpr QOperatingSystemVersionBase Windows10_1903 { QOperatingSystemVersionBase::Windows, 10, 0, 18362 }; // 19H1
static constexpr QOperatingSystemVersionBase Windows10_1909 { QOperatingSystemVersionBase::Windows, 10, 0, 18363 }; // 19H2
static constexpr QOperatingSystemVersionBase Windows10_2004 { QOperatingSystemVersionBase::Windows, 10, 0, 19041 }; // 20H1
static constexpr QOperatingSystemVersionBase Windows10_20H2 { QOperatingSystemVersionBase::Windows, 10, 0, 19042 };
static constexpr QOperatingSystemVersionBase Windows10_21H1 { QOperatingSystemVersionBase::Windows, 10, 0, 19043 };
static constexpr QOperatingSystemVersionBase Windows10_21H2 { QOperatingSystemVersionBase::Windows, 10, 0, 19044 };
constexpr QOperatingSystemVersion(const QOperatingSystemVersionBase &osversion)
: QOperatingSystemVersionBase(osversion) {}