1 files changed, 90 insertions, 27 deletions

diff --git a/tests/auto/corelib/tools/qsize/tst_qsize.cpp b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
index 83b4f1bd34..d379275dd8 100644
--- a/tests/auto/corelib/tools/qsize/tst_qsize.cpp
+++ b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
@@ -1,40 +1,44 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// 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>
+
 Q_DECLARE_METATYPE(QMargins)
 
 class tst_QSize : public QObject
 {
     Q_OBJECT
 private slots:
+    void compareCompiles();
+    void compare_data();
+    void compare();
+
     void getSetCheck();
     void scale();
 
@@ -47,12 +51,47 @@ private slots:
     void grownOrShrunkBy_data();
     void grownOrShrunkBy();
 
+    void toSizeF_data();
+    void toSizeF();
+
     void transpose_data();
     void transpose();
 
     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()
 {
@@ -232,6 +271,30 @@ void tst_QSize::grownOrShrunkBy()
     QCOMPARE(shrunk.grownBy(margins), input);
 }
 
+void tst_QSize::toSizeF_data()
+{
+    QTest::addColumn<QSize>("input");
+    QTest::addColumn<QSizeF>("result");
+
+    auto row = [](int w, int h) {
+        QTest::addRow("(%d, %d)", w, h) << QSize(w, h) << QSizeF(w, h);
+    };
+    constexpr std::array samples = {-1, 0, 1};
+    for (int w : samples) {
+        for (int h : samples) {
+            row(w, h);
+        }
+    }
+}
+
+void tst_QSize::toSizeF()
+{
+    QFETCH(const QSize, input);
+    QFETCH(const QSizeF, result);
+
+    QCOMPARE(input.toSizeF(), result);
+}
+
 void tst_QSize::transpose_data()
 {
     QTest::addColumn<QSize>("input1");