1 files changed, 35 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 7512829e09..431db86330 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -126,6 +126,8 @@ private slots:
     void implicitConstruction();
 
     void guiVariantAtExit();
+
+    void iconEquality();
 };
 
 void tst_QGuiVariant::constructor_invalid_data()
@@ -466,8 +468,8 @@ void tst_QGuiVariant::vector3D()
     QVariant variant;
     QVector3D vector = qvariant_cast<QVector3D>(variant);
     QVERIFY(vector.isNull());
-    variant.setValue(QVector3D(0.1, 0.2, 0.3));
-    QCOMPARE(QVector3D(0.1, 0.2, 0.3), qvariant_cast<QVector3D>(variant));
+    variant.setValue(QVector3D(0.1f, 0.2f, 0.3f));
+    QCOMPARE(QVector3D(0.1f, 0.2f, 0.3f), qvariant_cast<QVector3D>(variant));
 
     void *pvector = QMetaType::create(QVariant::Vector3D, 0);
     QVERIFY(pvector);
@@ -479,8 +481,8 @@ void tst_QGuiVariant::vector4D()
     QVariant variant;
     QVector4D vector = qvariant_cast<QVector4D>(variant);
     QVERIFY(vector.isNull());
-    variant.setValue(QVector4D(0.1, 0.2, 0.3, 0.4));
-    QCOMPARE(QVector4D(0.1, 0.2, 0.3, 0.4), qvariant_cast<QVector4D>(variant));
+    variant.setValue(QVector4D(0.1f, 0.2f, 0.3f, 0.4f));
+    QCOMPARE(QVector4D(0.1f, 0.2f, 0.3f, 0.4f), qvariant_cast<QVector4D>(variant));
 
     void *pvector = QMetaType::create(QVariant::Vector4D, 0);
     QVERIFY(pvector);
@@ -492,8 +494,8 @@ void tst_QGuiVariant::quaternion()
     QVariant variant;
     QQuaternion quaternion = qvariant_cast<QQuaternion>(variant);
     QVERIFY(quaternion.isIdentity());
-    variant.setValue(QQuaternion(0.1, 0.2, 0.3, 0.4));
-    QCOMPARE(QQuaternion(0.1, 0.2, 0.3, 0.4), qvariant_cast<QQuaternion>(variant));
+    variant.setValue(QQuaternion(0.1f, 0.2f, 0.3f, 0.4f));
+    QCOMPARE(QQuaternion(0.1f, 0.2f, 0.3f, 0.4f), qvariant_cast<QQuaternion>(variant));
 
     void *pquaternion = QMetaType::create(QVariant::Quaternion, 0);
     QVERIFY(pquaternion);
@@ -761,5 +763,32 @@ void tst_QGuiVariant::guiVariantAtExit()
     QVERIFY(true);
 }
 
+void tst_QGuiVariant::iconEquality()
+{
+    QIcon i;
+    QVariant a = i;
+    QVariant b = i;
+    QCOMPARE(a, b);
+
+    i = QIcon(":/black.png");
+    a = i;
+    QVERIFY(a != b);
+
+    b = a;
+    QCOMPARE(a, b);
+
+    i = QIcon(":/black2.png");
+    a = i;
+    QVERIFY(a != b);
+
+    b = i;
+    QCOMPARE(a, b);
+
+    // This is a "different" QIcon
+    // even if the contents are the same
+    b = QIcon(":/black2.png");
+    QVERIFY(a != b);
+}
+
 QTEST_MAIN(tst_QGuiVariant)
 #include "tst_qguivariant.moc"