1 files changed, 33 insertions, 6 deletions
diff --git a/src/corelib/kernel/qelapsedtimer.h b/src/corelib/kernel/qelapsedtimer.h
index 7d8b889f61..e71573456d 100644
--- a/src/corelib/kernel/qelapsedtimer.h
+++ b/src/corelib/kernel/qelapsedtimer.h
@@ -4,6 +4,7 @@
 #ifndef QELAPSEDTIMER_H
 #define QELAPSEDTIMER_H
 
+#include <QtCore/qcompare.h>
 #include <QtCore/qglobal.h>
 
 #include <chrono>
@@ -45,15 +46,41 @@ public:
     Duration durationTo(const QElapsedTimer &other) const noexcept;
     qint64 msecsTo(const QElapsedTimer &other) const noexcept;
     qint64 secsTo(const QElapsedTimer &other) const noexcept;
-
-    friend bool operator==(const QElapsedTimer &lhs, const QElapsedTimer &rhs) noexcept
-    { return lhs.t1 == rhs.t1 && lhs.t2 == rhs.t2; }
-    friend bool operator!=(const QElapsedTimer &lhs, const QElapsedTimer &rhs) noexcept
-    { return !(lhs == rhs); }
-
     friend bool Q_CORE_EXPORT operator<(const QElapsedTimer &lhs, const QElapsedTimer &rhs) noexcept;
 
 private:
+    friend bool comparesEqual(const QElapsedTimer &lhs, const QElapsedTimer &rhs) noexcept
+    {
+        return lhs.t1 == rhs.t1 && lhs.t2 == rhs.t2;
+    }
+    Q_DECLARE_EQUALITY_COMPARABLE(QElapsedTimer)
+
+    friend Qt::strong_ordering compareThreeWay(const QElapsedTimer &lhs,
+                                               const QElapsedTimer &rhs) noexcept
+    {
+        return Qt::compareThreeWay(lhs.t1, rhs.t1);
+    }
+
+#if defined(__cpp_lib_three_way_comparison)
+    friend std::strong_ordering
+    operator<=>(const QElapsedTimer &lhs, const QElapsedTimer &rhs) noexcept
+    {
+        return compareThreeWay(lhs, rhs);
+    }
+#else
+    friend bool operator>(const QElapsedTimer &lhs, const QElapsedTimer &rhs) noexcept
+    {
+        return is_gt(compareThreeWay(lhs, rhs));
+    }
+    friend bool operator<=(const QElapsedTimer &lhs, const QElapsedTimer &rhs) noexcept
+    {
+        return is_lteq(compareThreeWay(lhs, rhs));
+    }
+    friend bool operator>=(const QElapsedTimer &lhs, const QElapsedTimer &rhs) noexcept
+    {
+        return is_gteq(compareThreeWay(lhs, rhs));
+    }
+#endif // defined(__cpp_lib_three_way_comparison)
     qint64 t1 = Q_INT64_C(0x8000000000000000);
     qint64 t2 = Q_INT64_C(0x8000000000000000);
 };