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

Move private QOperatingSystemVersion::compare to removed_api

Browse Source 
From the API review.

Pick-to: 6.3
Change-Id: I9877990f75189b99a372ea6342d07a7031228ac7
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Mårten Nordheim 2022-01-24 13:29:51 +01:00
parent 4cd8eeaf8c
commit c781d5ed08
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/compat/removed_api.cpp
View File

@ -133,6 +133,14 @@ QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char
}
# endif
#include "qoperatingsystemversion.h"
int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1,
const QOperatingSystemVersion &v2)
{
return QOperatingSystemVersionBase::compare(v1, v2);
}
#endif // QT_REMOVED_SINCE(6, 3)
#if QT_REMOVED_SINCE(6, 4)

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

@ -253,12 +253,6 @@ int QOperatingSystemVersionBase::compare(QOperatingSystemVersionBase v1,
return compareVersionComponents(v1.m_major, v2.m_major);
}
int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1,
const QOperatingSystemVersion &v2)
{
return QOperatingSystemVersionBase::compare(v1, v2);
}
/*!
\fn QVersionNumber QOperatingSystemVersion::version() const

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

@ -265,9 +265,11 @@ public:
private:
QOperatingSystemVersion() = default;
#if QT_REMOVED_SINCE(6, 3)
// ### Qt 7: Remove. It's only here for backwards compat with previous inline calls.
[[maybe_unused]] static int compare(const QOperatingSystemVersion &v1,
const QOperatingSystemVersion &v2);
#endif
};
Q_DECLARE_TYPEINFO(QOperatingSystemVersion, Q_PRIMITIVE_TYPE);