1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add version() to QOperatingSystemVersion

Browse Source 
Change-Id: I6c7f0616d52b0d118ffd8c031f3f51212b8ed821
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Schmertmann 2020-10-18 13:51:18 +02:00 committed by Lars Schmertmann
parent d2b0856f59
commit 89b2b60e63
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,19 @@ int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1,
return compareVersionComponents(v1.m_major, v2.m_major); 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 \fn int QOperatingSystemVersion::majorVersion() const
@ -249,7 +262,7 @@ int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1,
-1 indicates an unknown or absent version number component. -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. -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. -1 indicates an unknown or absent version number component.
\sa majorVersion(), minorVersion() \sa version(), majorVersion(), minorVersion()
*/ */
/*! /*!

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

@ -38,6 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtCore/qversionnumber.h>
#ifndef QOPERATINGSYSTEMVERSION_H #ifndef QOPERATINGSYSTEMVERSION_H
#define QOPERATINGSYSTEMVERSION_H #define QOPERATINGSYSTEMVERSION_H
@ -45,7 +46,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QString; class QString;
class QVersionNumber;
class Q_CORE_EXPORT QOperatingSystemVersion class Q_CORE_EXPORT QOperatingSystemVersion
{ {
@ -114,6 +114,8 @@ public:
#endif #endif
} }
QVersionNumber version() const { return QVersionNumber(m_major, m_minor, m_micro); }
constexpr int majorVersion() const { return m_major; } constexpr int majorVersion() const { return m_major; }
constexpr int minorVersion() const { return m_minor; } constexpr int minorVersion() const { return m_minor; }
constexpr int microVersion() const { return m_micro; } constexpr int microVersion() const { return m_micro; }