12 files changed, 14 insertions, 40 deletions
diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro
index 3f0122b..c1adf15 100644
--- a/tests/auto/checkxmlfiles/checkxmlfiles.pro
+++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro
@@ -6,7 +6,7 @@ QT = core gui testlib
 
 include (../xmlpatterns.pri)
 
-wince*|symbian: {
+wince*: {
 QT += network
 addFiles.files = \
 	$$QT_SOURCE_TREE/examples/sql/masterdetail/albumdetails.xml \
diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro
index 0790854..c36c120 100644
--- a/tests/auto/patternistexamples/patternistexamples.pro
+++ b/tests/auto/patternistexamples/patternistexamples.pro
@@ -2,7 +2,7 @@ TARGET = tst_patternistexamples
 CONFIG += testcase
 SOURCES += tst_patternistexamples.cpp
 QT += testlib
-wince*|symbian: {
+wince*: {
 	snippets.files = $$QT_SOURCE_TREE/doc/src/snippets/patternist/*
 	snippets.path = patternist
 	widgetRen.files = $$QT_SOURCE_TREE/examples/xmlpatterns/xquery/widgetRenderer/*
diff --git a/tests/auto/qxmlformatter/qxmlformatter.pro b/tests/auto/qxmlformatter/qxmlformatter.pro
index 054b3dc..71cf56d 100644
--- a/tests/auto/qxmlformatter/qxmlformatter.pro
+++ b/tests/auto/qxmlformatter/qxmlformatter.pro
@@ -5,7 +5,7 @@ SOURCES += tst_qxmlformatter.cpp
 
 include (../xmlpatterns.pri)
 
-wince*|symbian:{
+wince*:{
    addFiles.files = baselines input
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro
index 48cf8d4..66e1158 100644
--- a/tests/auto/qxmlquery/qxmlquery.pro
+++ b/tests/auto/qxmlquery/qxmlquery.pro
@@ -13,23 +13,18 @@ QT += network testlib
 
 wince* {
     DEFINES += SRCDIR=\\\"./\\\"
-} else:!symbian {
+} else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
 include (../xmlpatterns.pri)
 
-wince*|symbian: {
+wince*: {
    addFiles.files = pushBaselines input.xml
    addFiles.path    = .
 
    patternistFiles.files = ../xmlpatterns/queries
-   symbian: {
-       #../xmlpatterns resolves to an illegal path for deployment
-       patternistFiles.path    = xmlpatterns
-   } else {
-       patternistFiles.path    = ../xmlpatterns
-   }
+   patternistFiles.path    = ../xmlpatterns
 
    DEPLOYMENT += addFiles patternistFiles
 }
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index 838e062..27f3964 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -63,12 +63,7 @@
 #include "TestFundament.h"
 #include "../network-settings.h"
 
-#if defined(Q_OS_SYMBIAN)
-#define SRCDIR ""
-#define XMLPATTERNSDIR "xmlpatterns"
-#else
 #define XMLPATTERNSDIR SRCDIR "../xmlpatterns"
-#endif
 
 /*!
  \class tst_QXmlQuery
diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri
index 1d978f3..320d6cb 100644
--- a/tests/auto/xmlpatterns.pri
+++ b/tests/auto/xmlpatterns.pri
@@ -12,7 +12,6 @@ QT -= gui
 
 XMLPATTERNS_SDK = QtXmlPatternsSDK
 if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
-    symbian:    XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}
-    else:win32: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}d
-    else:       XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}_debug
+    win32: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}d
+    else:  XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}_debug
 }
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
index b3d745b..2d67bcd 100644
--- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@ -46,10 +46,6 @@
 #include "../qxmlquery/TestFundament.h"
 #include "../network-settings.h"
 
-#if defined(Q_OS_SYMBIAN)
-#define SRCDIR ""
-#endif
-
 /*!
  \class tst_XmlPatterns
  \internal
@@ -136,8 +132,6 @@ void tst_XmlPatterns::xquerySupport()
 
 #ifdef Q_OS_WINCE
     QSKIP("WinCE: This test uses unsupported WinCE functionality");
-#elif defined(Q_OS_SYMBIAN)
-    QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)");
 #elif defined(Q_OS_MAC)
     QSKIP("MacOs: Failed on Mac. Will be fixed by bug fix for QTBUG-22556");
 #endif
@@ -230,7 +224,7 @@ void tst_XmlPatterns::xquerySupport()
 
 void tst_XmlPatterns::xquerySupport_data() const
 {
-#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_WINCE)
     return;
 #endif
 
@@ -861,8 +855,6 @@ void tst_XmlPatterns::xsltSupport_data() const
 
 #ifdef Q_OS_WINCE
     QSKIP("WinCE: This test uses unsupported WinCE functionality");
-#elif defined(Q_OS_SYMBIAN)
-    QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)");
 #endif
 
     QTest::addColumn<int>("expectedExitCode");
diff --git a/tests/auto/xmlpatterns/xmlpatterns.pro b/tests/auto/xmlpatterns/xmlpatterns.pro
index 8716b9a..a775c2e 100644
--- a/tests/auto/xmlpatterns/xmlpatterns.pro
+++ b/tests/auto/xmlpatterns/xmlpatterns.pro
@@ -6,7 +6,7 @@ SOURCES += tst_xmlpatterns.cpp \
 
 wince* {
 DEFINES += SRCDIR=\\\"./\\\"
-} else:!symbian {
+} else {
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
index 14810ac..2e858a0 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
+++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
@@ -19,7 +19,7 @@ INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk  \
                ../xmlpatternsxqts                      \
                ../xmlpatternssdk
 
-wince*|symbian {
+wince* {
    catalog.files = TestSuite Baseline.xml
    catalog.path = .
    DEPLOYMENT += catalog
diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
index 29bef87..bc5ecd7 100644
--- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
+++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
@@ -10,9 +10,8 @@ SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp
 
 PATTERNIST_SDK = QtXmlPatternsSDK
 if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
-    symbian:    PATTERNIST_SDK = $${PATTERNIST_SDK}
-    else:win32: PATTERNIST_SDK = $${PATTERNIST_SDK}d
-    else:       PATTERNIST_SDK = $${PATTERNIST_SDK}_debug
+    win32: PATTERNIST_SDK = $${PATTERNIST_SDK}d
+    else:  PATTERNIST_SDK = $${PATTERNIST_SDK}_debug
 }
 
 LIBS += -L$$QT.xmlpatterns.libs -l$$PATTERNIST_SDK
diff --git a/tests/auto/xmlpatternssdk/Global.h b/tests/auto/xmlpatternssdk/Global.h
index 3f203a7..fb9472c 100644
--- a/tests/auto/xmlpatternssdk/Global.h
+++ b/tests/auto/xmlpatternssdk/Global.h
@@ -47,7 +47,7 @@
 #include <private/qitem_p.h>
 #include <private/qnamepool_p.h>
 
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_WIN)
 #   ifdef Q_PATTERNISTSDK_BUILDING
         #define Q_PATTERNISTSDK_EXPORT __declspec(dllexport)
     #else
diff --git a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
index db9c3a9..395cce8 100644
--- a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
+++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
@@ -15,12 +15,6 @@ mac {
     INSTALLS += target
 }
 
-symbian {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    MMP_RULES += EXPORTUNFROZEN
-}
-
 # We add gui, because xmlpatterns.pri pull it out.
 QT      += xmlpatterns xml network testlib gui