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/qimage | |
| parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) | |
| download | qtbase-95cebd34ebc5b4d39b11dc91610309a35e488663.tar.gz | |
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/qimage')
| -rw-r--r-- | tests/auto/gui/image/qimage/qimage.pro | 10 | ||||
| -rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/tests/auto/gui/image/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro index b517bc1237..87828b9c3e 100644 --- a/tests/auto/gui/image/qimage/qimage.pro +++ b/tests/auto/gui/image/qimage/qimage.pro @@ -8,16 +8,6 @@ wince*: { addImages.path = images DEPLOYMENT += addImages DEFINES += SRCDIR=\\\".\\\" -} else:symbian { - TARGET.EPOCHEAPSIZE = 0x200000 0x800000 - addImages.files = images/* - addImages.path = images - DEPLOYMENT += addImages - qt_not_deployed { - imagePlugins.files = qjpeg.dll qgif.dll qmng.dll qtiff.dll qico.dll - imagePlugins.path = imageformats - DEPLOYMENT += imagePlugins - } } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index dce2957ae4..a144fdb3fc 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -54,9 +54,6 @@ //TESTED_CLASS= //TESTED_FILES= -#if defined(Q_OS_SYMBIAN) -# define SRCDIR "" -#endif Q_DECLARE_METATYPE(QImage::Format) Q_DECLARE_METATYPE(Qt::GlobalColor) @@ -268,11 +265,7 @@ void tst_QImage::formatHandlersInput_data() { QTest::addColumn<QString>("testFormat"); QTest::addColumn<QString>("testFile"); - #ifdef Q_OS_SYMBIAN - const QString prefix = QLatin1String(SRCDIR) + "images/"; - #else const QString prefix = QLatin1String(SRCDIR) + "/images/"; - #endif // add a new line here when a file is added QTest::newRow("ICO") << "ICO" << prefix + "image.ico"; @@ -1499,8 +1492,6 @@ void tst_QImage::smoothScaleBig() { #if defined(Q_OS_WINCE) int bigValue = 2000; -#elif defined(Q_OS_SYMBIAN) - int bigValue = 2000; #else int bigValue = 200000; #endif |