Remove some files as instructed by Legal department.

Task-number: QT-3613

7 files changed, 0 insertions, 96 deletions

diff --git a/tests/auto/qimagereader/images/pngwithcompressedtext.png b/tests/auto/qimagereader/images/pngwithcompressedtext.png
deleted file mode 100644
index 01b2270..0000000
--- a/tests/auto/qimagereader/images/pngwithcompressedtext.png
+++ /dev/null
diff --git a/tests/auto/qimagereader/images/pngwithtext.png b/tests/auto/qimagereader/images/pngwithtext.png
deleted file mode 100644
index 5d93799..0000000
--- a/tests/auto/qimagereader/images/pngwithtext.png
+++ /dev/null
diff --git a/tests/auto/qimagereader/qimagereader.qrc b/tests/auto/qimagereader/qimagereader.qrc
index 278427b..1acc82f 100644
--- a/tests/auto/qimagereader/qimagereader.qrc
+++ b/tests/auto/qimagereader/qimagereader.qrc
@@ -38,8 +38,6 @@
         <file>images/noclearcode.bmp</file>
         <file>images/noclearcode.gif</file>
         <file>images/nontransparent.xpm</file>
-        <file>images/pngwithcompressedtext.png</file>
-        <file>images/pngwithtext.png</file>
         <file>images/runners.ppm</file>
         <file>images/teapot.ppm</file>
         <file>images/test.ppm</file>
diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index e9ef070..5b30b04 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -123,9 +123,6 @@ private slots:
     void supportsAnimation_data();
     void supportsAnimation();
 
-    void description_data();
-    void description();
-
     void readFromResources_data();
     void readFromResources();
 
@@ -1253,53 +1250,6 @@ void tst_QImageReader::devicePosition()
 }
 
 
-void tst_QImageReader::description_data()
-{
-    QTest::addColumn<QString>("fileName");
-    QTest::addColumn<QStringMap>("description");
-
-    QMap<QString, QString> willem;
-    willem["Title"] = "PngSuite";
-    willem["Author"] = "Willem A.J. van Schaik (gwillem@ntuvax.ntu.ac.sg)";
-    willem["Copyright"] = "Copyright Willem van Schaik, Singapore 1995";
-    willem["Description"] = "A compilation of a set of images created to test the "
-                            "various color-types of the PNG format. Included are "
-                            "black&white, color, paletted, with alpha channel, with "
-                            "transparency formats. All bit-depths allowed according "
-                            "to the spec are present.";
-    willem["Software"] = "Created on a NeXTstation color using \"pnmtopng\".";
-    willem["Disclaimer"] = "Freeware.";
-
-    QTest::newRow("PNG") << QString("pngwithtext.png") << willem;
-    QTest::newRow("PNG Compressed") << QString("pngwithcompressedtext.png") << willem;
-}
-
-void tst_QImageReader::description()
-{
-    QFETCH(QString, fileName);
-    QFETCH(QStringMap, description);
-
-    // Sanity check
-    QVERIFY(!QImage(prefix + fileName).isNull());
-
-    QImageReader reader(prefix + fileName);
-
-    foreach (QString key, description.keys())
-        QCOMPARE(reader.text(key), description.value(key));
-    QCOMPARE(reader.textKeys(), QStringList(description.keys()));
-
-    QImage image = reader.read();
-    QVERIFY(!image.isNull());
-
-    foreach (QString key, description.keys())
-        QCOMPARE(image.text(key), description.value(key));
-    QCOMPARE(image.textKeys(), QStringList(description.keys()));
-
-    foreach (QString key, description.keys())
-        QCOMPARE(reader.text(key), description.value(key));
-    QCOMPARE(reader.textKeys(), QStringList(description.keys()));
-}
-
 void tst_QImageReader::readFromResources_data()
 {
     QTest::addColumn<QString>("fileName");
@@ -1405,12 +1355,6 @@ void tst_QImageReader::readFromResources_data()
     QTest::newRow("image.png") << QString("image.png")
                                       << QByteArray("png") << QSize(22, 22)
                                       << QString("");
-    QTest::newRow("pngwithcompressedtext.png") << QString("pngwithcompressedtext.png")
-                                                      << QByteArray("png") << QSize(32, 32)
-                                                      << QString("");
-    QTest::newRow("pngwithtext.png") << QString("pngwithtext.png")
-                                            << QByteArray("png") << QSize(32, 32)
-                                            << QString("");
     QTest::newRow("kollada.png") << QString("kollada.png")
                                         << QByteArray("png") << QSize(436, 160)
                                         << QString("");
diff --git a/tests/auto/qimagewriter/tst_qimagewriter.cpp b/tests/auto/qimagewriter/tst_qimagewriter.cpp
index c4860c3..c6ec715 100644
--- a/tests/auto/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/qimagewriter/tst_qimagewriter.cpp
@@ -93,9 +93,6 @@ private slots:
     void largeTiff();
 #endif
 
-    void setDescription_data();
-    void setDescription();
-
     void writeToInvalidDevice();
 
     void supportsOption_data();
@@ -420,41 +417,6 @@ void tst_QImageWriter::readWriteNonDestructive()
     QCOMPARE(image, image2);
 }
 
-void tst_QImageWriter::setDescription_data()
-{
-    QTest::addColumn<QString>("fileName");
-    QTest::addColumn<QStringMap>("description");
-
-    QMap<QString, QString> willem;
-    willem["Title"] = "PngSuite";
-    willem["Author"] = "Willem A.J. van Schaik (willem@schaik.com)";
-    willem["Copyright"] = "Copyright Willem van Schaik, Singapore 1995-96";
-    willem["Description"] = "A compilation of a set of images created to test the "
-                            "various color-types of the PNG format. Included are "
-                            "black&white, color, paletted, with alpha channel, with "
-                            "transparency formats. All bit-depths allowed according "
-                            "to the spec are present.";
-    willem["Software"] = "Created on a NeXTstation color using \"pnmtopng\".";
-    willem["Disclaimer"] = "Freeware.";
-
-    QTest::newRow("PNG") << prefix + QString("gen-pngwithtext.png") << willem;
-}
-
-void tst_QImageWriter::setDescription()
-{
-    QFETCH(QString, fileName);
-    QFETCH(QStringMap, description);
-
-    QImageWriter writer(fileName, "png");
-    foreach (QString key, description.keys())
-        writer.setText(key, description.value(key));
-    QVERIFY(writer.write(QImage(prefix + "kollada.png")));
-
-    QImageReader reader(fileName);
-    foreach (QString key, description.keys())
-        QCOMPARE(reader.text(key), description.value(key));
-}
-
 void tst_QImageWriter::writeToInvalidDevice()
 {
     QLatin1String fileName("/these/directories/do/not/exist/001.png");
diff --git a/tests/benchmarks/gui/image/qimagereader/images/pngwithcompressedtext.png b/tests/benchmarks/gui/image/qimagereader/images/pngwithcompressedtext.png
deleted file mode 100644
index 01b2270..0000000
--- a/tests/benchmarks/gui/image/qimagereader/images/pngwithcompressedtext.png
+++ /dev/null
diff --git a/tests/benchmarks/gui/image/qimagereader/images/pngwithtext.png b/tests/benchmarks/gui/image/qimagereader/images/pngwithtext.png
deleted file mode 100644
index 5d93799..0000000
--- a/tests/benchmarks/gui/image/qimagereader/images/pngwithtext.png
+++ /dev/null