1 files changed, 21 insertions, 23 deletions
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h
index 80cf7428c9..e7ae107226 100644
--- a/src/corelib/tools/qversionnumber.h
+++ b/src/corelib/tools/qversionnumber.h
@@ -6,10 +6,12 @@
 #ifndef QVERSIONNUMBER_H
 #define QVERSIONNUMBER_H
 
+#include <QtCore/qcompare.h>
 #include <QtCore/qcontainertools_impl.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qmetatype.h>
 #include <QtCore/qnamespace.h>
+#include <QtCore/qspan.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qtypeinfo.h>
 #if !defined(QT_LEAN_HEADERS) || QT_LEAN_HEADERS < 2
@@ -113,7 +115,7 @@ class QVersionNumber
 
         Q_CORE_EXPORT void setListData(QList<int> &&seg);
 
-        explicit SegmentStorage(std::initializer_list<int> args)
+        explicit SegmentStorage(QSpan<const int> args)
             : SegmentStorage(args.begin(), args.end()) {}
 
         explicit SegmentStorage(const int *first, const int *last)
@@ -256,19 +258,20 @@ public:
     inline QVersionNumber() noexcept
         : m_segments()
     {}
+    Q_WEAK_OVERLOAD
     inline explicit QVersionNumber(const QList<int> &seg) : m_segments(seg) { }
 
     // compiler-generated copy/move ctor/assignment operators and the destructor are ok
 
+    Q_WEAK_OVERLOAD
     explicit QVersionNumber(QList<int> &&seg) : m_segments(std::move(seg)) { }
 
     inline QVersionNumber(std::initializer_list<int> args)
-        : m_segments(args)
+        : m_segments(QSpan{args})
     {}
 
-    template <qsizetype N>
-    explicit QVersionNumber(const QVarLengthArray<int, N> &sec)
-        : m_segments(sec.begin(), sec.end())
+    explicit QVersionNumber(QSpan<const int> args)
+        : m_segments(args)
     {}
 
     inline explicit QVersionNumber(int maj)
@@ -353,25 +356,20 @@ public:
     [[nodiscard]] Q_CORE_EXPORT static QVersionNumber fromString(QStringView string, int *suffixIndex);
 #endif
 
-    [[nodiscard]] friend bool operator> (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) > 0; }
-
-    [[nodiscard]] friend bool operator>=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) >= 0; }
-
-    [[nodiscard]] friend bool operator< (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) < 0; }
-
-    [[nodiscard]] friend bool operator<=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) <= 0; }
-
-    [[nodiscard]] friend bool operator==(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) == 0; }
-
-    [[nodiscard]] friend bool operator!=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) != 0; }
-
 private:
+    [[nodiscard]] friend bool comparesEqual(const QVersionNumber &lhs,
+                                            const QVersionNumber &rhs) noexcept
+    {
+        return compare(lhs, rhs) == 0;
+    }
+    [[nodiscard]] friend Qt::strong_ordering compareThreeWay(const QVersionNumber &lhs,
+                                                             const QVersionNumber &rhs) noexcept
+    {
+        int c = compare(lhs, rhs);
+        return Qt::compareThreeWay(c, 0);
+    }
+    Q_DECLARE_STRONGLY_ORDERED(QVersionNumber)
+
 #ifndef QT_NO_DATASTREAM
     friend Q_CORE_EXPORT QDataStream& operator>>(QDataStream &in, QVersionNumber &version);
 #endif