2 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index afa72f6922..329c3ae66d 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -53,6 +53,7 @@ private slots:
     void actualSize2_data(); // test with 2 pixmaps with different aspect ratio
     void actualSize2();
     void isNull();
+    void isMask();
     void swap();
     void bestMatch();
     void cacheKey();
@@ -219,6 +220,20 @@ void tst_QIcon::isNull() {
     QVERIFY(iconSupportedFormat.actualSize(QSize(32, 32)).isValid());
 }
 
+void tst_QIcon::isMask()
+{
+    QIcon icon;
+    icon.setIsMask(true);
+    icon.addPixmap(QPixmap());
+    QVERIFY(icon.isMask());
+
+    QIcon icon2;
+    icon2.setIsMask(true);
+    QVERIFY(icon2.isMask());
+    icon2.setIsMask(false);
+    QVERIFY(!icon2.isMask());
+}
+
 void tst_QIcon::swap()
 {
     QPixmap p1(1, 1), p2(2, 2);
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 84fdd81f6c..c45342cc06 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -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()