16 files changed, 8 insertions, 133 deletions
diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro
index 31301b9..6f71e5b 100644
--- a/tests/auto/checkxmlfiles/checkxmlfiles.pro
+++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro
@@ -6,17 +6,4 @@ QT = core gui testlib
 
 include (../xmlpatterns.pri)
 
-wince*: {
-QT += network
-requires(!isEmpty(_QMAKE_SUPER_CACHE_))
-addFiles.files = \
-        ../../../examples/xquery/globalVariables/globals.gccxml \
-        ../../../../qtdoc/doc/src/diagrams/stylesheet/treeview.svg \
-        ../../../../qtdoc/doc/src/diagrams/designer-manual/designer-mainwindow-actions.ui \
-        ../../../../qtsql/examples/sql/masterdetail/albumdetails.xml \
-        ../../../../qtbase/examples/widgets/tools/undo/undo.qrc
-addFiles.path = xmlfiles
-DEPLOYMENT += addFiles
-} else {
-    DEFINES += SOURCETREE=\\\"$$absolute_path(../../..)/\\\"
-}
+DEFINES += SOURCETREE=\\\"$$absolute_path(../../..)/\\\"
diff --git a/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp b/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
index 2afdaf7..625dbcc 100644
--- a/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
+++ b/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
@@ -83,12 +83,7 @@ void tst_CheckXMLFiles::checkXMLFiles_data() const
     /* We don't do HTML files currently because so many of them in 3rd party are broken. */
     patterns.append(QLatin1String("*.xhtml"));
 
-#ifndef Q_OS_WINCE
-    QString path = QLatin1String(SOURCETREE);
-#else
-    QString path = QFINDTESTDATA("xmlfiles");
-#endif
-    QDirIterator it(path, patterns, QDir::AllEntries, QDirIterator::Subdirectories);
+    QDirIterator it(QLatin1String(SOURCETREE), patterns, QDir::AllEntries, QDirIterator::Subdirectories);
     while(it.hasNext())
     {
         it.next();
diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro
index dfb8ba8..f415e30 100644
--- a/tests/auto/patternistexamples/patternistexamples.pro
+++ b/tests/auto/patternistexamples/patternistexamples.pro
@@ -2,24 +2,7 @@ TARGET = tst_patternistexamples
 CONFIG += testcase
 SOURCES += tst_patternistexamples.cpp
 QT += testlib
-wince*: {
-    snippets.files = ../../../doc/src/snippets/patternist/*
-    snippets.path = patternist
-    widgetRen.files = ../../../examples/xquery/widgetRenderer/*
-    widgetRen.path = widgetRenderer
-    globVar.files = ../../../examples/xquery/globalVariables/*
-    globVar.path = globalVariables
-    filetree.files = ../../../examples/filetree/*
-    filetree.path = filetree
-    recipes.files = ../../../examples/recipes/*
-    recipes.path = recipes
-    files.files = ../../../examples/recipes/files/*
-    files.path = recipes\\files
 
-    DEPLOYMENT += snippets widgetRen globVar filetree recipes files
-    # take care of dependency
-    QT += network
-} else {
-    DEFINES += SOURCETREE=\\\"$$absolute_path(../../..)/\\\"
-}
+DEFINES += SOURCETREE=\\\"$$absolute_path(../../..)/\\\"
+
 include (../xmlpatterns.pri)
diff --git a/tests/auto/patternistexamples/tst_patternistexamples.cpp b/tests/auto/patternistexamples/tst_patternistexamples.cpp
index 7801e20..3aed232 100644
--- a/tests/auto/patternistexamples/tst_patternistexamples.cpp
+++ b/tests/auto/patternistexamples/tst_patternistexamples.cpp
@@ -68,19 +68,12 @@ private:
 
 void tst_PatternistExamples::initTestCase()
 {
-#ifndef Q_OS_WINCE
     m_dirs.append(QDir(QLatin1String(SOURCETREE "src/xmlpatterns/doc/snippets/patternist/")));
     m_dirs.append(QDir(QLatin1String(SOURCETREE "examples/xmlpatterns/xquery/globalVariables/")));
     m_dirs.append(QDir(QLatin1String(SOURCETREE "examples/xmlpatterns/filetree/")));
     m_dirs.append(QDir(QLatin1String(SOURCETREE "examples/xmlpatterns/recipes/")));
     m_dirs.append(QDir(QLatin1String(SOURCETREE "examples/xmlpatterns/recipes/files/")));
-#else
-    m_dirs.append(QDir(QFINDTESTDATA("patternist/")));
-    m_dirs.append(QDir(QFINDTESTDATA("globalVariables/")));
-    m_dirs.append(QDir(QFINDTESTDATA("filetree/")));
-    m_dirs.append(QDir(QFINDTESTDATA("recipes/")));
-    m_dirs.append(QDir(QFINDTESTDATA("recipes/files/")));
-#endif
+
     for(int i = 0; i < m_dirs.size(); ++i)
         QVERIFY(m_dirs.at(i).exists());
 }
diff --git a/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro b/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro
index f8b4df1..d1fe536 100644
--- a/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro
+++ b/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro
@@ -9,10 +9,3 @@ HEADERS += TestNodeModel.h LoadingModel.h
 TESTDATA = tree.xml
 
 include (../xmlpatterns.pri)
-
-wince*: {
-   addFiles.files = tree.xml
-   addFiles.path    = .
-
-   DEPLOYMENT += addFiles
-}
diff --git a/tests/auto/qxmlformatter/qxmlformatter.pro b/tests/auto/qxmlformatter/qxmlformatter.pro
index 6e9e262..b464c39 100644
--- a/tests/auto/qxmlformatter/qxmlformatter.pro
+++ b/tests/auto/qxmlformatter/qxmlformatter.pro
@@ -6,9 +6,3 @@ SOURCES += tst_qxmlformatter.cpp
 TESTDATA = baselines/* input/*
 
 include (../xmlpatterns.pri)
-
-wince*:{
-   addFiles.files = baselines input
-   addFiles.path = .
-   DEPLOYMENT += addFiles
-}
diff --git a/tests/auto/qxmlquery/TestFundament.cpp b/tests/auto/qxmlquery/TestFundament.cpp
index d28314f..9313fa1 100644
--- a/tests/auto/qxmlquery/TestFundament.cpp
+++ b/tests/auto/qxmlquery/TestFundament.cpp
@@ -43,7 +43,7 @@ TestFundament::TestFundament()
 
 QString TestFundament::offset()
 {
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_OS_WIN)
     /* On Windows, the executable is placed in a release/ or debug/ folder. */
     return QLatin1String("../");
 #elif defined(Q_OS_MAC)
diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro
index 7dca9b9..1f25eda 100644
--- a/tests/auto/qxmlquery/qxmlquery.pro
+++ b/tests/auto/qxmlquery/qxmlquery.pro
@@ -14,13 +14,3 @@ QT += network testlib
 TESTDATA = data/* pushBaselines/* input.xml
 
 include (../xmlpatterns.pri)
-
-wince*: {
-   addFiles.files = pushBaselines input.xml
-   addFiles.path    = .
-
-   patternistFiles.files = ../xmlpatterns/queries
-   patternistFiles.path    = ../xmlpatterns
-
-   DEPLOYMENT += addFiles patternistFiles
-}
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index c3d1e03..1754d7d 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -1984,13 +1984,6 @@ void tst_QXmlQuery::fnDocNetworkAccessSuccess() const
             || QTest::currentDataTag() == QByteArray("ftp scheme"))
         QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
 
-#if defined(Q_OS_WINCE) && !defined(_X86_)
-    QStringList testsToSkip;
-    testsToSkip << "http scheme" << "ftp scheme";
-    if (testsToSkip.contains(QTest::currentDataTag()))
-        QSKIP("Network tests are currently unsupported on Windows CE.");
-#endif
-
     QFETCH(QUrl, uriToOpen);
     QFETCH(QByteArray, expectedOutput);
 
@@ -2524,13 +2517,6 @@ void tst_QXmlQuery::setQueryQUrlSuccess() const
             || QTest::currentDataTag() == QByteArray("A valid query via the http scheme"))
         QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
 
-#if defined(Q_OS_WINCE) && !defined(_X86_)
-    QStringList testsToSkip;
-    testsToSkip << "A valid query via the ftp scheme" << "A valid query via the http scheme";
-    if (testsToSkip.contains(QTest::currentDataTag()))
-        QSKIP("Network tests are currently unsupported on Windows CE.");
-#endif
-
     QFETCH(QUrl, queryURI);
     QFETCH(QByteArray, expectedOutput);
 
diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri
index 96d8261..84cf72b 100644
--- a/tests/auto/xmlpatterns.pri
+++ b/tests/auto/xmlpatterns.pri
@@ -1,14 +1,6 @@
 QT += core-private xmlpatterns xmlpatterns-private
-
-wince*: {
-    patternsdk.files = $$QT.xmlpatterns.libs/QtXmlPatternsSDK*.dll
-    patternsdk.path = .
-    basedata.files = xmlpaternsxqts/Baseline.xml
-    basedata.path = .
-    DEPLOYMENT += patternsdk
-    QT += network
-}
 QT -= gui
+
 QMAKE_RPATHLINKDIR *= $$QT.gui.libs
 
 XMLPATTERNS_SDK = QtXmlPatternsSDK
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
index 61fa555..1711666 100644
--- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@ -132,10 +132,6 @@ void tst_XmlPatterns::xquerySupport()
     if(m_dontRun)
         QSKIP("The command line utility is not in the path.");
 
-#ifdef Q_OS_WINCE
-    QSKIP("WinCE: This test uses unsupported WinCE functionality");
-#endif
-
 #ifndef QT_NO_PROCESS
     QFETCH(int,         expectedExitCode);
     QFETCH(QByteArray,  expectedQueryOutput);
@@ -230,10 +226,6 @@ void tst_XmlPatterns::xquerySupport()
 
 void tst_XmlPatterns::xquerySupport_data() const
 {
-#if defined(Q_OS_WINCE)
-    return;
-#endif
-
     QString path = QFINDTESTDATA("queries/");
 
     /* Check one file for existence, to avoid possible false positives. */
@@ -872,10 +864,6 @@ void tst_XmlPatterns::xsltSupport_data() const
     if(m_dontRun)
         QSKIP("The command line utility is not in the path.");
 
-#ifdef Q_OS_WINCE
-    QSKIP("WinCE: This test uses unsupported WinCE functionality");
-#endif
-
     QString spath = QFINDTESTDATA("stylesheets/");
     QString qpath = QFINDTESTDATA("queries/");
 
diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
index 54aa71d..4d182d6 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
+++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
@@ -19,11 +19,5 @@ INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk  \
                ../xmlpatternsxqts                      \
                ../xmlpatternssdk
 
-wince* {
-   catalog.files = TestSuite Baseline.xml
-   catalog.path = .
-   DEPLOYMENT += catalog
-}
-
 requires(contains(QT_CONFIG,private_tests))
 
diff --git a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
index 254d37b..f60672a 100644
--- a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
+++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
@@ -19,7 +19,7 @@ mac {
 QT      += xmlpatterns xml network testlib gui
 
 DESTDIR    = $$QT.xmlpatterns.libs
-!wince*:DLLDESTDIR = $$QT.xmlpatterns.bins
+DLLDESTDIR = $$QT.xmlpatterns.bins
 
 # syncqt doesn't copy headers in tools/ so let's manually ensure
 # it works with shadow builds and source builds.
diff --git a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
index ee6151a..8e86dd9 100644
--- a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
+++ b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
@@ -88,10 +88,6 @@ void tst_XmlPatternsValidator::xsdSupport()
     if(m_dontRun)
         QSKIP("The command line utility is not in the path.");
 
-#ifdef Q_OS_WINCE
-    QSKIP("WinCE: This test uses unsupported WinCE functionality");
-#endif
-
 #ifndef QT_NO_PROCESS
     QFETCH(int,         expectedExitCode);
     QFETCH(QStringList, arguments);
@@ -118,10 +114,6 @@ void tst_XmlPatternsValidator::xsdSupport()
 
 void tst_XmlPatternsValidator::xsdSupport_data() const
 {
-#ifdef Q_OS_WINCE
-    return;
-#endif
-
     QString path = QFINDTESTDATA("files/");
 
     /* Check one file for existence, to avoid a flood of failures. */
diff --git a/tests/auto/xmlpatternsview/xmlpatternsview.pro b/tests/auto/xmlpatternsview/xmlpatternsview.pro
index 2fd12ab..5331e33 100644
--- a/tests/auto/xmlpatternsview/xmlpatternsview.pro
+++ b/tests/auto/xmlpatternsview/xmlpatternsview.pro
@@ -5,9 +5,3 @@ SOURCES += tst_xmlpatternsview.cpp
 include (../xmlpatterns.pri)
 
 TARGET = tst_xmlpatternsview
-
-wince*: {
-    viewexe.files = $$QT.xmlpatterns.bins/xmlpatternsview.exe
-    viewexe.path = .
-    DEPLOYMENT += viewexe
-}
diff --git a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
index f9dc1c2..ddde8a9 100644
--- a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
+++ b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
@@ -16,10 +16,4 @@ INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk  \
                ../xmlpatternsxqts                      \
                ../xmlpatternssdk
 
-wince*: {
-    testdata.files = XSLTS Baseline.xml
-    testdata.path = .
-    DEPLOYMENT += testdata
-}
-
 requires(contains(QT_CONFIG,private_tests))