2 files changed, 21 insertions, 6 deletions
diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/qimage/qimage.pro
index f10a488..69d6f0f 100644
--- a/tests/auto/qimage/qimage.pro
+++ b/tests/auto/qimage/qimage.pro
@@ -6,6 +6,13 @@ wince*: {
    addImages.path = images
    DEPLOYMENT += addImages
    DEFINES += SRCDIR=\\\".\\\"
+} else:symbian* {
+   TARGET.EPOCHEAPSIZE = 0x200000 0x800000
+   addImages.sources = images/*
+   addImages.path = images
+   imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll qtiff.dll qico.dll
+   imagePlugins.path = imageformats
+   DEPLOYMENT += addImages imagePlugins
 } else {
    contains(QT_CONFIG, qt3support): QT += qt3support
    DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp
index 06c9a56..af02bbf 100644
--- a/tests/auto/qimage/tst_qimage.cpp
+++ b/tests/auto/qimage/tst_qimage.cpp
@@ -51,8 +51,12 @@
 #include <qpainter.h>
 #include <private/qdrawhelper_p.h>
 
+
 //TESTED_CLASS=
 //TESTED_FILES=
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
 
 Q_DECLARE_METATYPE(QImage::Format)
 
@@ -262,8 +266,11 @@ 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";
@@ -285,7 +292,6 @@ void tst_QImage::formatHandlersInput()
 {
     QFETCH(QString, testFormat);
     QFETCH(QString, testFile);
-
     QList<QByteArray> formats = QImageReader::supportedImageFormats();
    // qDebug("Image input formats : %s", formats.join(" | ").latin1());
 
@@ -297,7 +303,7 @@ void tst_QImage::formatHandlersInput()
 	}
     }
     if (formatSupported) {
-//	qDebug(QImage::imageFormat(testFile));
+//     qDebug(QImage::imageFormat(testFile));
 	QCOMPARE(testFormat.toLatin1().toLower(), QImageReader::imageFormat(testFile));
     } else {
 	QString msg = "Format not supported : ";
@@ -1469,10 +1475,12 @@ void tst_QImage::smoothScale3()
 
 void tst_QImage::smoothScaleBig()
 {
-#ifndef Q_OS_WINCE
-    int bigValue = 200000;
+#if defined(Q_OS_WINCE)
+    int bigValue = 2000;    
+#elif defined(Q_OS_SYMBIAN)
+    int bigValue = 2000;    
 #else
-    int bigValue = 2000;
+    int bigValue = 200000;
 #endif
     QImage tall(4, bigValue, QImage::Format_ARGB32);
     tall.fill(0x0);