diff options
Diffstat (limited to 'tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp')
-rw-r--r-- | tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp index 7a94217641..191aabdf6a 100644 --- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp @@ -239,7 +239,7 @@ void tst_QImageWriter::writeImage2_data() foreach (const QString format, formats) { const QString fileName = QLatin1String("solidcolor_") + QString::number(imgFormat) + QLatin1Char('.') + format; - QTest::newRow(fileName.toLatin1()) << fileName + QTest::newRow(fileName.toLatin1()) << writePrefix + fileName << format.toLatin1() << image; } @@ -496,9 +496,6 @@ void tst_QImageWriter::saveToTemporaryFile() QVERIFY(writer.write(image)); else qWarning() << file.errorString(); -#if defined(Q_OS_WINCE) - file.reset(); -#endif QCOMPARE(QImage(writer.fileName()), image); } { @@ -513,18 +510,15 @@ void tst_QImageWriter::saveToTemporaryFile() } { // 3) Via QImageWriter's API, with a named temp file - QTemporaryFile file("tempXXXXXX"); + QTemporaryFile file(writePrefix + QLatin1String("tempXXXXXX")); QVERIFY2(file.open(), qPrintable(file.errorString())); QImageWriter writer(&file, "PNG"); QVERIFY(writer.write(image)); -#if defined(Q_OS_WINCE) - file.reset(); -#endif QCOMPARE(QImage(writer.fileName()), image); } { // 4) Via QImage's API, with a named temp file - QTemporaryFile file("tempXXXXXX"); + QTemporaryFile file(writePrefix + QLatin1String("tempXXXXXX")); QVERIFY2(file.open(), qPrintable(file.errorString())); QVERIFY(image.save(&file, "PNG")); file.reset(); |