diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-10-18 13:51:18 +0200 |
|---|---|---|
| committer | Lars Schmertmann <lars.schmertmann@governikus.de> | 2020-12-28 17:33:20 +0000 |
| commit | 89b2b60e6374c62d97b739b3351753e552cd16bb (patch) | |
| tree | 7aa0390971fca2e858f1cfa6528594f38767846a /src | |
| parent | d2b0856f59fa850c93347cd3b643aa457967a5f4 (diff) | |
Add version() to QOperatingSystemVersion
Change-Id: I6c7f0616d52b0d118ffd8c031f3f51212b8ed821
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 19 | ||||
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 4 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 1d7ec46c11..4e623f658f 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -239,6 +239,19 @@ int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1, } /*! + \fn QVersionNumber QOperatingSystemVersion::version() const + + \since 6.1 + + Returns the operating system's version number. + + See the main class documentation for what the version number is on a given + operating system. + + \sa majorVersion(), minorVersion(), microVersion() +*/ + +/*! \fn int QOperatingSystemVersion::majorVersion() const Returns the major version number, that is, the first segment of the @@ -249,7 +262,7 @@ int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1, -1 indicates an unknown or absent version number component. - \sa minorVersion(), microVersion() + \sa version(), minorVersion(), microVersion() */ /*! @@ -263,7 +276,7 @@ int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1, -1 indicates an unknown or absent version number component. - \sa majorVersion(), microVersion() + \sa version(), majorVersion(), microVersion() */ /*! @@ -277,7 +290,7 @@ int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1, -1 indicates an unknown or absent version number component. - \sa majorVersion(), minorVersion() + \sa version(), majorVersion(), minorVersion() */ /*! diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index 37ace76755..2058ca3fc7 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -38,6 +38,7 @@ ****************************************************************************/ #include <QtCore/qglobal.h> +#include <QtCore/qversionnumber.h> #ifndef QOPERATINGSYSTEMVERSION_H #define QOPERATINGSYSTEMVERSION_H @@ -45,7 +46,6 @@ QT_BEGIN_NAMESPACE class QString; -class QVersionNumber; class Q_CORE_EXPORT QOperatingSystemVersion { @@ -114,6 +114,8 @@ public: #endif } + QVersionNumber version() const { return QVersionNumber(m_major, m_minor, m_micro); } + constexpr int majorVersion() const { return m_major; } constexpr int minorVersion() const { return m_minor; } constexpr int microVersion() const { return m_micro; } |