1 files changed, 48 insertions, 5 deletions
diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
index 97eb19599b..a662fea615 100644
--- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
+++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
@@ -33,6 +33,9 @@
 #include <QtGui/QColor>
 #include <QtGui/QImage>
 #include <QtGui/QPixmap>
+#include <QtGui/QVector2D>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
 #endif
 
 /* XPM test data for QPixmap, QImage tests (use drag cursors as example) */
@@ -137,6 +140,7 @@ private slots:
     void compareQListInt();
     void compareQListDouble();
 #ifdef QT_GUI_LIB
+    void compareQColor_data();
     void compareQColor();
     void compareQPixmaps();
     void compareQPixmaps_data();
@@ -144,6 +148,9 @@ private slots:
     void compareQImages_data();
     void compareQRegion_data();
     void compareQRegion();
+    void compareQVector2D();
+    void compareQVector3D();
+    void compareQVector4D();
 #endif
     void verify();
     void verify2();
@@ -371,13 +378,22 @@ void tst_Cmptest::compareQListDouble()
 }
 
 #ifdef QT_GUI_LIB
+void tst_Cmptest::compareQColor_data()
+{
+    QTest::addColumn<QColor>("colorA");
+    QTest::addColumn<QColor>("colorB");
+
+    QTest::newRow("Qt::yellow vs \"yellow\"") << QColor(Qt::yellow) << QColor(QStringLiteral("yellow"));
+    QTest::newRow("Qt::yellow vs Qt::green") << QColor(Qt::yellow) << QColor(Qt::green);
+    QTest::newRow("0x88ff0000 vs 0xffff0000") << QColor::fromRgba(0x88ff0000) << QColor::fromRgba(0xffff0000);
+}
+
 void tst_Cmptest::compareQColor()
 {
-    const QColor yellow(Qt::yellow);
-    const QColor yellowFromName(QStringLiteral("yellow"));
-    const QColor green(Qt::green);
-    QCOMPARE(yellow, yellowFromName);
-    QCOMPARE(yellow, green);
+    QFETCH(QColor, colorA);
+    QFETCH(QColor, colorB);
+
+    QCOMPARE(colorA, colorB);
 }
 
 void tst_Cmptest::compareQPixmaps_data()
@@ -454,6 +470,33 @@ void tst_Cmptest::compareQRegion()
 
     QCOMPARE(rA, rB);
 }
+
+void tst_Cmptest::compareQVector2D()
+{
+    QVector2D v2a{1, 2};
+    QVector2D v2b = v2a;
+    QCOMPARE(v2a, v2b);
+    v2b.setY(3);
+    QCOMPARE(v2a, v2b);
+}
+
+void tst_Cmptest::compareQVector3D()
+{
+    QVector3D v3a{1, 2, 3};
+    QVector3D v3b = v3a;
+    QCOMPARE(v3a, v3b);
+    v3b.setY(3);
+    QCOMPARE(v3a, v3b);
+}
+
+void tst_Cmptest::compareQVector4D()
+{
+    QVector4D v4a{1, 2, 3, 4};
+    QVector4D v4b = v4a;
+    QCOMPARE(v4a, v4b);
+    v4b.setY(3);
+    QCOMPARE(v4a, v4b);
+}
 #endif // QT_GUI_LIB
 
 static int opaqueFunc()