1 files changed, 20 insertions, 11 deletions
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 20a08e10a2..7333dd739f 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();
@@ -75,14 +76,8 @@ private:
     const QString m_pngImageFileName;
     const QString m_pngRectFileName;
     const QString m_sourceFileName;
-
-    const static QIcon staticIcon;
 };
 
-// Creating an icon statically should not cause a crash.
-// But we do not officially support this. See QTBUG-8666
-const QIcon tst_QIcon::staticIcon = QIcon::fromTheme("edit-find");
-
 bool tst_QIcon::haveImageFormat(QByteArray const& desiredFormat)
 {
     return QImageReader::supportedImageFormats().contains(desiredFormat);
@@ -224,6 +219,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);
@@ -354,10 +363,10 @@ void tst_QIcon::cacheKey()
     qint64 icon1_key = icon1.cacheKey();
     QIcon icon2 = icon1;
 
-    QVERIFY(icon2.cacheKey() == icon1.cacheKey());
+    QCOMPARE(icon2.cacheKey(), icon1.cacheKey());
     icon2.detach();
     QVERIFY(icon2.cacheKey() != icon1.cacheKey());
-    QVERIFY(icon1.cacheKey() == icon1_key);
+    QCOMPARE(icon1.cacheKey(), icon1_key);
 }
 
 void tst_QIcon::detach()
@@ -374,7 +383,7 @@ void tst_QIcon::detach()
 
     img1 = icon1.pixmap(32, 32).toImage();
     img2 = icon2.pixmap(32, 32).toImage();
-    QVERIFY(img1 == img2);
+    QCOMPARE(img1, img2);
 }
 
 void tst_QIcon::addFile()
@@ -562,7 +571,7 @@ void tst_QIcon::fromTheme()
     QString firstSearchPath = QLatin1String(":/icons");
     QString secondSearchPath = QLatin1String(":/second_icons");
     QIcon::setThemeSearchPaths(QStringList() << firstSearchPath << secondSearchPath);
-    QVERIFY(QIcon::themeSearchPaths().size() == 2);
+    QCOMPARE(QIcon::themeSearchPaths().size(), 2);
     QCOMPARE(firstSearchPath, QIcon::themeSearchPaths()[0]);
     QCOMPARE(secondSearchPath, QIcon::themeSearchPaths()[1]);
 
@@ -599,7 +608,7 @@ void tst_QIcon::fromTheme()
 
     // Test non existing icon with fallback
     noIcon = QIcon::fromTheme("broken-icon", abIcon);
-    QVERIFY(noIcon.cacheKey() == abIcon.cacheKey());
+    QCOMPARE(noIcon.cacheKey(), abIcon.cacheKey());
 
     // Test svg-only icon
     noIcon = QIcon::fromTheme("svg-icon", abIcon);