diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 1d7ec46c110..4e623f658f2 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -238,6 +238,19 @@ int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1, return compareVersionComponents(v1.m_major, v2.m_major); } +/*! + \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 @@ -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 37ace76755d..2058ca3fc70 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -38,6 +38,7 @@ ****************************************************************************/ #include +#include #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; }