1 files changed, 16 insertions, 6 deletions

diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 58c595ad07..0a704b9f64 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -140,13 +140,13 @@ void tst_QGuiVariant::constructor_invalid()
         QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
         QVariant variant(static_cast<QVariant::Type>(typeId));
         QVERIFY(!variant.isValid());
-        QVERIFY(variant.userType() == QMetaType::UnknownType);
+        QCOMPARE(variant.userType(), int(QMetaType::UnknownType));
     }
     {
         QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
         QVariant variant(typeId, /* copy */ 0);
         QVERIFY(!variant.isValid());
-        QVERIFY(variant.userType() == QMetaType::UnknownType);
+        QCOMPARE(variant.userType(), int(QMetaType::UnknownType));
     }
 }
 
@@ -250,6 +250,14 @@ void tst_QGuiVariant::toColor_data()
     QColor c("red");
     QTest::newRow( "string" ) << QVariant( QString( "red" ) ) << c;
     QTest::newRow( "solid brush" ) << QVariant( QBrush(c) ) << c;
+    QTest::newRow("qbytearray") << QVariant(QByteArray("red")) << c;
+    QTest::newRow("same color") << QVariant(c) << c;
+    QTest::newRow("qstring(#ff0000)") << QVariant(QString::fromUtf8("#ff0000")) << c;
+    QTest::newRow("qbytearray(#ff0000)") << QVariant(QByteArray("#ff0000")) << c;
+
+    c.setNamedColor("#88112233");
+    QTest::newRow("qstring(#88112233)") << QVariant(QString::fromUtf8("#88112233")) << c;
+    QTest::newRow("qbytearray(#88112233)") << QVariant(QByteArray("#88112233")) << c;
 }
 
 void tst_QGuiVariant::toColor()
@@ -260,6 +268,8 @@ void tst_QGuiVariant::toColor()
     QVERIFY( value.canConvert( QVariant::Color ) );
     QColor d = qvariant_cast<QColor>(value);
     QCOMPARE( d, result );
+    QVERIFY(value.convert(QMetaType::QColor));
+    QCOMPARE(d, QColor(value.toString()));
 }
 
 void tst_QGuiVariant::toPixmap_data()
@@ -611,9 +621,9 @@ void tst_QGuiVariant::writeToReadFromDataStream()
                 // the uninitialized float can be NaN (observed on Windows Mobile 5 ARMv4i)
                 float readFloat = qvariant_cast<float>(readVariant);
                 float writtenFloat = qvariant_cast<float>(writeVariant);
-                QVERIFY(qIsNaN(readFloat) == qIsNaN(writtenFloat));
+                QCOMPARE(qIsNaN(readFloat), qIsNaN(writtenFloat));
                 if (!qIsNaN(readFloat))
-                    QVERIFY(readFloat == writtenFloat);
+                    QCOMPARE(readFloat, writtenFloat);
             }
             break;
         }
@@ -632,7 +642,7 @@ void tst_QGuiVariant::writeToReadFromOldDataStream()
         dataFileStream.setVersion(QDataStream::Qt_4_9);
         QVariant readVariant;
         dataFileStream >> readVariant;
-        QVERIFY(readVariant.userType() == QMetaType::QPolygonF);
+        QCOMPARE(readVariant.userType(), int(QMetaType::QPolygonF));
         QCOMPARE(testVariant, readVariant);
         file.close();
     }
@@ -656,7 +666,7 @@ void tst_QGuiVariant::writeToReadFromOldDataStream()
         QDataStream readVarData(variantData);
         readVarData >> dummy;
         readVarData >> polyData50;
-        QVERIFY(polyData49 == polyData50);
+        QCOMPARE(polyData49, polyData50);
     }
 }