diff --git a/tests/auto/gui/image/qicon/heart.svg b/tests/auto/gui/image/qicon/heart.svg
deleted file mode 100644
index 8c982cd93c..0000000000
--- a/tests/auto/gui/image/qicon/heart.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
diff --git a/tests/auto/gui/image/qicon/heart.svgz b/tests/auto/gui/image/qicon/heart.svgz
deleted file mode 100644
index 0f0913ffa7..0000000000
Binary files a/tests/auto/gui/image/qicon/heart.svgz and /dev/null differ
diff --git a/tests/auto/gui/image/qicon/rect.svg b/tests/auto/gui/image/qicon/rect.svg
deleted file mode 100644
index 8eb24727be..0000000000
--- a/tests/auto/gui/image/qicon/rect.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
diff --git a/tests/auto/gui/image/qicon/trash.svg b/tests/auto/gui/image/qicon/trash.svg
deleted file mode 100644
index c44e4c75a2..0000000000
--- a/tests/auto/gui/image/qicon/trash.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 7d455f1010..4a9ab93921 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -58,13 +58,11 @@ private slots:
void actualSize();
void actualSize2_data(); // test with 2 pixmaps with different aspect ratio
void actualSize2();
- void svgActualSize();
void isNull();
void swap();
void bestMatch();
void cacheKey();
void detach();
- void svg();
void addFile();
void availableSizes();
void name();
@@ -181,28 +179,6 @@ void tst_QIcon::actualSize2()
QCOMPARE(icon.pixmap(argument).size(), result);
}
-void tst_QIcon::svgActualSize()
-{
- if (!haveImageFormat("svg")) {
- QSKIP("SVG support is not available");
- }
-
- const QString prefix = QFileInfo(QFINDTESTDATA("icons")).absolutePath() + "/";
- QIcon icon(prefix + "rect.svg");
- QCOMPARE(icon.actualSize(QSize(16, 16)), QSize(16, 2));
- QCOMPARE(icon.pixmap(QSize(16, 16)).size(), QSize(16, 2));
-
- QPixmap p(16, 16);
- p.fill(Qt::cyan);
- icon.addPixmap(p);
-
- QCOMPARE(icon.actualSize(QSize(16, 16)), QSize(16, 16));
- QCOMPARE(icon.pixmap(QSize(16, 16)).size(), QSize(16, 16));
-
- QCOMPARE(icon.actualSize(QSize(16, 14)), QSize(16, 2));
- QCOMPARE(icon.pixmap(QSize(16, 14)).size(), QSize(16, 2));
-}
-
void tst_QIcon::isNull() {
// test default constructor
QIcon defaultConstructor;
@@ -395,54 +371,6 @@ void tst_QIcon::detach()
QVERIFY(img1 == img2);
}
-void tst_QIcon::svg()
-{
- if (!haveImageFormat("svg")) {
- QSKIP("SVG support is not available");
- }
- QIcon icon1("heart.svg");
-
- QVERIFY(!icon1.pixmap(32).isNull());
- QImage img1 = icon1.pixmap(32).toImage();
- QVERIFY(!icon1.pixmap(32, QIcon::Disabled).isNull());
- QImage img2 = icon1.pixmap(32, QIcon::Disabled).toImage();
-
- icon1.addFile("trash.svg", QSize(), QIcon::Disabled);
- QVERIFY(!icon1.pixmap(32, QIcon::Disabled).isNull());
- QImage img3 = icon1.pixmap(32, QIcon::Disabled).toImage();
- QVERIFY(img3 != img2);
- QVERIFY(img3 != img1);
-
- QPixmap pm("image.png");
- icon1.addPixmap(pm, QIcon::Normal, QIcon::On);
- QVERIFY(!icon1.pixmap(128, QIcon::Normal, QIcon::On).isNull());
- QImage img4 = icon1.pixmap(128, QIcon::Normal, QIcon::On).toImage();
- QVERIFY(img4 != img3);
- QVERIFY(img4 != img2);
- QVERIFY(img4 != img1);
-
- QIcon icon2;
- icon2.addFile("heart.svg");
- QVERIFY(icon2.pixmap(57).toImage() == icon1.pixmap(57).toImage());
-
- QIcon icon3("trash.svg");
- icon3.addFile("heart.svg");
- QVERIFY(icon3.pixmap(57).toImage() == icon1.pixmap(57).toImage());
-
- QIcon icon4("heart.svg");
- icon4.addFile("image.png", QSize(), QIcon::Active);
- QVERIFY(!icon4.pixmap(32).isNull());
- QVERIFY(!icon4.pixmap(32, QIcon::Active).isNull());
- QVERIFY(icon4.pixmap(32).toImage() == img1);
- QIcon pmIcon(pm);
- QVERIFY(icon4.pixmap(pm.size(), QIcon::Active).toImage() == pmIcon.pixmap(pm.size(), QIcon::Active).toImage());
-
-#ifndef QT_NO_COMPRESS
- QIcon icon5("heart.svgz");
- QVERIFY(!icon5.pixmap(32).isNull());
-#endif
-}
-
void tst_QIcon::addFile()
{
QIcon icon;
@@ -506,22 +434,6 @@ void tst_QIcon::availableSizes()
QCOMPARE(availableSizes.at(0), QSize(16,16));
}
- if (haveImageFormat("svg")) {
- // checks that there are no availableSizes for scalable images.
- QIcon icon("heart.svg");
- QList availableSizes = icon.availableSizes();
- QVERIFY(availableSizes.isEmpty());
- }
-
- if (haveImageFormat("svg")) {
- // even if an a scalable image contain added pixmaps,
- // availableSizes still should be empty.
- QIcon icon("heart.svg");
- icon.addFile("image.png", QSize(32,32));
- QList availableSizes = icon.availableSizes();
- QVERIFY(availableSizes.isEmpty());
- }
-
{
// we try to load an icon from resources
QIcon icon(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png"));