From c781d5ed080f3f525ed4ea3728b40967b6d397ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 24 Jan 2022 13:29:51 +0100 Subject: [PATCH] Move private QOperatingSystemVersion::compare to removed_api From the API review. Pick-to: 6.3 Change-Id: I9877990f75189b99a372ea6342d07a7031228ac7 Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira --- src/corelib/compat/removed_api.cpp | 8 ++++++++ src/corelib/global/qoperatingsystemversion.cpp | 6 ------ src/corelib/global/qoperatingsystemversion.h | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index d670bad4074..231b03c3172 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -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) diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 2255b08f68f..084fd2b12f6 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -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 diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index 2ab08a5427f..e48c499ab9a 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -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);