diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-06 00:27:31 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-06 00:27:42 +0000 |
| commit | 1d62bf3150b4457a325b75e88783a746b1277a8e (patch) | |
| tree | 9f6443faf441dd7b36d2549e174fcc4f0009f31d /src/corelib/global | |
| parent | 570485be95275f8535f65d1de0668c6037e02ee0 (diff) | |
Revert "QOperatingSystemVersion: Add support for Win10 sub-versions"
This reverts commit 9568362bfe9bdbd6a67ab4bbf9fd9504d3868529 because
the implementation does not use the agreed-upon solution of static
constexpr (thus, inline) variables. This change needs to be re-issued
after that suppotr lands.
Change-Id: Ib42f3828dcbed66603adc2a699cdac2a8469b263
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 56 | ||||
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 7 |
2 files changed, 0 insertions, 63 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index b722801bb1..61f64306e2 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -408,62 +408,6 @@ 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 - */ -const QOperatingSystemVersion QOperatingSystemVersion::Windows10_1809 = - QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 17763); - -/*! - \variable QOperatingSystemVersion::Windows10_1903 - \brief a version corresponding to Windows 10 1903 (version 10.0.18362). - \since 6.3 - */ -const QOperatingSystemVersion QOperatingSystemVersion::Windows10_1903 = - QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 18362); - -/*! - \variable QOperatingSystemVersion::Windows10_1909 - \brief a version corresponding to Windows 10 1909 (version 10.0.18363). - \since 6.3 - */ -const QOperatingSystemVersion QOperatingSystemVersion::Windows10_1909 = - QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 18363); - -/*! - \variable QOperatingSystemVersion::Windows10_2004 - \brief a version corresponding to Windows 10 2004 (version 10.0.19041). - \since 6.3 - */ -const QOperatingSystemVersion QOperatingSystemVersion::Windows10_2004 = - QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 19041); - -/*! - \variable QOperatingSystemVersion::Windows10_20H2 - \brief a version corresponding to Windows 10 20H2 (version 10.0.19042). - \since 6.3 - */ -const QOperatingSystemVersion QOperatingSystemVersion::Windows10_20H2 = - QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 19042); - -/*! - \variable QOperatingSystemVersion::Windows10_21H1 - \brief a version corresponding to Windows 10 21H1 (version 10.0.19043). - \since 6.3 - */ -const QOperatingSystemVersion QOperatingSystemVersion::Windows10_21H1 = - QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 19043); - -/*! - \variable QOperatingSystemVersion::Windows10_21H2 - \brief a version corresponding to Windows 10 21H2 (version 10.0.19044). - \since 6.3 - */ -const QOperatingSystemVersion QOperatingSystemVersion::Windows10_21H2 = - QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 19044); - -/*! \variable QOperatingSystemVersion::OSXMavericks \brief a version corresponding to OS X Mavericks (version 10.9). \since 5.9 diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index c60017feb7..c884e0e3e8 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -64,13 +64,6 @@ public: static const QOperatingSystemVersion Windows8; static const QOperatingSystemVersion Windows8_1; static const QOperatingSystemVersion Windows10; - static const QOperatingSystemVersion Windows10_1809; // RS5 - static const QOperatingSystemVersion Windows10_1903; // 19H1 - static const QOperatingSystemVersion Windows10_1909; // 19H2 - static const QOperatingSystemVersion Windows10_2004; // 20H1 - static const QOperatingSystemVersion Windows10_20H2; // 20H2 - static const QOperatingSystemVersion Windows10_21H1; // 21H1 - static const QOperatingSystemVersion Windows10_21H2; // 21H2 static const QOperatingSystemVersion OSXMavericks; static const QOperatingSystemVersion OSXYosemite; |