2 files changed, 14 insertions, 8 deletions
diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro
index 277039f..1b3659d 100644
--- a/tests/auto/qpainter/qpainter.pro
+++ b/tests/auto/qpainter/qpainter.pro
@@ -1,12 +1,15 @@
 load(qttest_p4)
 contains(QT_CONFIG, qt3support): QT += qt3support
 SOURCES  += tst_qpainter.cpp
-wince*: {
-    DEFINES += SRCDIR=\\\".\\\"
+wince*|symbian*: {
     addFiles.sources = drawEllipse drawLine_rop_bitmap drawPixmap_rop drawPixmap_rop_bitmap task217400.png
     addFiles.path = .
     DEPLOYMENT += addFiles
-} else {
+}
+
+wince* {
+    DEFINES += SRCDIR=\\\".\\\"
+} !symbian {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
 
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 8d6c9d2..740cfb1 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -50,7 +50,7 @@
 #include <qbitmap.h>
 #include <qimage.h>
 #include <limits.h>
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
 #include <qprinter.h>
 #include <math.h>
 #ifdef QT3_SUPPORT
@@ -67,6 +67,10 @@
 
 #include <qqueue.h>
 
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR "."
+#endif
+
 Q_DECLARE_METATYPE(QLine)
 Q_DECLARE_METATYPE(QRect)
 Q_DECLARE_METATYPE(QSize)
@@ -525,8 +529,7 @@ void tst_QPainter::qt_format_text_boundingRect()
 			QCOMPARE(pbr, br);
 		    }
 #endif
-
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
 		    {
 			QPrinter printer(QPrinter::HighResolution);
 			if (printer.printerName().isEmpty()) {
@@ -1422,7 +1425,7 @@ void tst_QPainter::drawPath2()
 
 void tst_QPainter::drawPath3()
 {
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QImage imgA(400, 400, QImage::Format_RGB32);
 #else
     QImage imgA(100, 100, QImage::Format_RGB32);
@@ -2959,7 +2962,7 @@ void tst_QPainter::monoImages()
     }
 }
 
-#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS)
+#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(Q_OS_SYMBIAN)
 #include <fenv.h>
 
 static const QString fpeExceptionString(int exception)