diff options
Diffstat (limited to 'tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp')
| -rw-r--r-- | tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp index b119763723..e21e671938 100644 --- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp @@ -52,9 +52,6 @@ #include <QPainter> #include <QSet> -#if defined(Q_OS_SYMBIAN) -# define SRCDIR "" -#endif typedef QMap<QString, QString> QStringMap; typedef QList<int> QIntList; Q_DECLARE_METATYPE(QImage) @@ -106,11 +103,9 @@ private slots: void saveToTemporaryFile(); }; -#ifdef Q_OS_SYMBIAN -static const QLatin1String prefix(SRCDIR "images/"); -#else + static const QLatin1String prefix(SRCDIR "/images/"); -#endif + static void initializePadding(QImage *image) { int effectiveBytesPerLine = (image->width() * image->depth() + 7) / 8; @@ -278,7 +273,7 @@ void tst_QImageWriter::writeImage2_data() #if defined QTEST_HAVE_TIFF void tst_QImageWriter::largeTiff() { -#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) +#if !defined(Q_OS_WINCE) QImage img(4096, 2048, QImage::Format_ARGB32); QPainter p(&img); @@ -305,7 +300,7 @@ void tst_QImageWriter::largeTiff() QCOMPARE(img, img2); #else - QWARN("not tested on Symbian/WinCE"); + QWARN("not tested on WinCE"); #endif } #endif |