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>

2 files changed, 1 insertions, 24 deletions

diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro
index 43d587ea48..e706f24814 100644
--- a/tests/auto/gui/image/qimagereader/qimagereader.pro
+++ b/tests/auto/gui/image/qimagereader/qimagereader.pro
@@ -3,7 +3,7 @@ SOURCES += tst_qimagereader.cpp
 MOC_DIR=tmp
 QT += widgets widgets-private core-private gui-private network
 RESOURCES += qimagereader.qrc
-!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 win32-msvc:QMAKE_CXXFLAGS -= -Zm200
 win32-msvc:QMAKE_CXXFLAGS += -Zm800
@@ -20,17 +20,3 @@ wince*: {
     DEPLOYMENT += images imagePlugins
     DEFINES += SRCDIR=\\\".\\\"
 }
-
-symbian: {
-    images.files = images
-    images.path = .
-
-    DEPLOYMENT += images
-
-    qt_not_deployed {
-        imagePlugins.files = qjpeg.dll qgif.dll qmng.dll
-        imagePlugins.path = imageformats
-
-        DEPLOYMENT += imagePlugins
-    }
-}
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index ffedc69a7f..d36a7bba39 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -57,10 +57,6 @@
 
 #include "../../../platformquirks.h"
 
-#if defined(Q_OS_SYMBIAN)
-# define SRCDIR "."
-#endif
-
 typedef QMap<QString, QString> QStringMap;
 typedef QList<int> QIntList;
 Q_DECLARE_METATYPE(QImage)
@@ -1089,11 +1085,6 @@ void tst_QImageReader::readFromDevice()
         QCOMPARE(image1, expectedImage);
     }
 
-#if defined (Q_OS_SYMBIAN) && defined (__WINS__)
-    //the emulator hangs in socket write (this is a test bug, it assumes the TCP stack can accept a whole image to its buffers)
-    if(imageData.size() > 16384)
-        QSKIP("image larger than socket buffer (test needs to be rewritten)", SkipSingle);
-#endif
     Server server(imageData);
     QEventLoop loop;
     connect(&server, SIGNAL(ready()), &loop, SLOT(quit()));