diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/auto/gui/image/qimagewriter | |
parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/gui/image/qimagewriter')
-rw-r--r-- | tests/auto/gui/image/qimagewriter/qimagewriter.pro | 9 | ||||
-rw-r--r-- | tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp | 13 |
2 files changed, 4 insertions, 18 deletions
diff --git a/tests/auto/gui/image/qimagewriter/qimagewriter.pro b/tests/auto/gui/image/qimagewriter/qimagewriter.pro index 0fc40d0f0a..ebd5efd49a 100644 --- a/tests/auto/gui/image/qimagewriter/qimagewriter.pro +++ b/tests/auto/gui/image/qimagewriter/qimagewriter.pro @@ -11,15 +11,6 @@ wince*: { addFiles.path = images DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\".\\\" -} else:symbian { - addFiles.files = images\\*.* - addFiles.path = images - DEPLOYMENT += addFiles - qt_not_deployed { - imagePlugins.files = qjpeg.dll qtiff.dll - imagePlugins.path = imageformats - DEPLOYMENT += imagePlugins - } } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } 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 |