2 files changed, 68 insertions, 3 deletions
diff --git a/tests/auto/corelib/tools/qsize/CMakeLists.txt b/tests/auto/corelib/tools/qsize/CMakeLists.txt
index 766b1bb3dc..4a4c96b52c 100644
--- a/tests/auto/corelib/tools/qsize/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qsize/CMakeLists.txt
@@ -1,13 +1,19 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qsize.pro.
-
 #####################################################################
 ## tst_qsize Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qsize LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qsize
     SOURCES
         tst_qsize.cpp
+    LIBRARIES
+        Qt::TestPrivate
 )
diff --git a/tests/auto/corelib/tools/qsize/tst_qsize.cpp b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
index 54ffd9fcfd..d379275dd8 100644
--- a/tests/auto/corelib/tools/qsize/tst_qsize.cpp
+++ b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
@@ -1,7 +1,30 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#include <QSize>
+#ifdef QVARIANT_H
+# error "This test requires qsize.h to not include qvariant.h"
+#endif
+
+// don't assume <type_traits>
+template <typename T, typename U>
+constexpr inline bool my_is_same_v = false;
+template <typename T>
+constexpr inline bool my_is_same_v<T, T> = true;
+
+#define CHECK(cvref) \
+    static_assert(my_is_same_v<decltype(get<0>(std::declval<QSize cvref >())), int cvref >); \
+    static_assert(my_is_same_v<decltype(get<1>(std::declval<QSize cvref >())), int cvref >)
+
+CHECK(&);
+CHECK(const &);
+CHECK(&&);
+CHECK(const &&);
+
+#undef CHECK
 
 #include <QTest>
+#include <QtTest/private/qcomparisontesthelper_p.h>
 #include <qsize.h>
 
 #include <array>
@@ -12,6 +35,10 @@ class tst_QSize : public QObject
 {
     Q_OBJECT
 private slots:
+    void compareCompiles();
+    void compare_data();
+    void compare();
+
     void getSetCheck();
     void scale();
 
@@ -33,6 +60,38 @@ private slots:
     void structuredBinding();
 };
 
+void tst_QSize::compareCompiles()
+{
+    QTestPrivate::testEqualityOperatorsCompile<QSize>();
+}
+
+void tst_QSize::compare_data()
+{
+    QTest::addColumn<QSize>("lhs");
+    QTest::addColumn<QSize>("rhs");
+    QTest::addColumn<bool>("result");
+
+    auto row = [](QSize lhs, QSize rhs, bool res) {
+        QTest::addRow("(%d, %d) vs (%d, %d)", lhs.width(), lhs.height(), rhs.width(), rhs.height())
+                << lhs << rhs << res;
+    };
+
+    row(QSize(0, 0), QSize(0, 0), true);
+    row(QSize(1, 0), QSize(0, 1), false);
+    row(QSize(-1, -1), QSize(-1, -1), true);
+    row(QSize(-1, -1), QSize(1, 1), false);
+    row(QSize(INT_MIN, INT_MAX), QSize(INT_MAX, INT_MIN), false);
+}
+
+void tst_QSize::compare()
+{
+    QFETCH(QSize, lhs);
+    QFETCH(QSize, rhs);
+    QFETCH(bool, result);
+
+    QT_TEST_EQUALITY_OPS(lhs, rhs, result);
+}
+
 // Testing get/set functions
 void tst_QSize::getSetCheck()
 {