126 files changed, 210 insertions, 278 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 022b19a..af9832c 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -445,17 +445,16 @@ SUBDIRS += \
            qplugin \
            qpluginloader \
            qscrollbar \
-           qsharedmemory \
            qsidebar \
            qsizegrip \
            qsqldriver \
-           qsystemsemaphore \
            qtconcurrentfilter \
            qtconcurrentiteratekernel \
            qtconcurrentmap \
            qtconcurrentrun \
            qtconcurrentthreadengine \
            qthreadpool \
+           qtipc \
            qtokenautomaton \
            qtouchevent \
            qwidget_window \
@@ -519,15 +518,16 @@ SUBDIRS += checkxmlfiles                \
            xmlpatternsdiagnosticsts     \
            xmlpatternsschema            \
            xmlpatternsschemats          \
+           xmlpatternssdk               \
            xmlpatternsvalidator         \
            xmlpatternsview              \
            xmlpatternsxqts              \
            xmlpatternsxslts
 
-xmlpatternsdiagnosticsts.depends = xmlpatternsxqts
-xmlpatternsview.depends = xmlpatternsxqts
-xmlpatternsxslts.depends = xmlpatternsxqts
-xmlpatternsschemats.depends = xmlpatternsxqts
+xmlpatternsdiagnosticsts.depends = xmlpatternssdk
+xmlpatternsview.depends = xmlpatternssdk
+xmlpatternsxslts.depends = xmlpatternssdk
+xmlpatternsschemats.depends = xmlpatternssdk
 }
 
 unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \
diff --git a/tests/auto/compilerwarnings/compilerwarnings.qrc b/tests/auto/compilerwarnings/compilerwarnings.qrc
index 40fa8f1..3fa313c 100644
--- a/tests/auto/compilerwarnings/compilerwarnings.qrc
+++ b/tests/auto/compilerwarnings/compilerwarnings.qrc
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
  <qresource>
-     <file>test.cpp</file>
+     <file>test_cpp.txt</file>
  </qresource>
  </RCC>
diff --git a/tests/auto/compilerwarnings/test.cpp b/tests/auto/compilerwarnings/test_cpp.txt
index 62b35eb..62b35eb 100644
--- a/tests/auto/compilerwarnings/test.cpp
+++ b/tests/auto/compilerwarnings/test_cpp.txt
diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
index 27624e9..f910a18 100644
--- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
+++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
@@ -148,7 +148,7 @@ void tst_CompilerWarnings::warnings()
     if (tmpSourceFile.isEmpty()) {
         tmpQSourceFile.open(QIODevice::ReadWrite | QIODevice::Truncate);
         tmpSourceFile = tmpQSourceFile.fileName();
-        QFile cppSource(":/test.cpp");
+        QFile cppSource(":/test_cpp.txt");
         bool openResult = cppSource.open(QIODevice::ReadOnly);
         if (openResult)
         {
@@ -158,7 +158,7 @@ void tst_CompilerWarnings::warnings()
         }
     }
     tmpQSourceFile.close();
-    QVERIFY2(openResult, "Need resource temporary \"test.cpp\"");
+    QVERIFY2(openResult, "Need resource temporary \"test_cpp.txt\"");
 
     QStringList args;
     QString compilerName;
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp
index ef92c56..1dde44b 100644
--- a/tests/auto/maketestselftest/tst_maketestselftest.cpp
+++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp
@@ -92,7 +92,9 @@ void tst_MakeTestSelfTest::auto_dot_pro_data()
     QStringList subdirs = dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot);
 
     foreach (const QString& subdir, subdirs) {
-        if (subdir == QString::fromLatin1("tmp")) {
+        if (subdir == QString::fromLatin1("tmp")
+            || subdir.startsWith("."))
+        {
             continue;
         }
         QTest::newRow(qPrintable(subdir)) << subdir;
diff --git a/tests/auto/modeltest/dynamictreemodel.h b/tests/auto/modeltest/dynamictreemodel.h
index 3f0d90d..9633755 100644
--- a/tests/auto/modeltest/dynamictreemodel.h
+++ b/tests/auto/modeltest/dynamictreemodel.h
@@ -48,8 +48,6 @@
 #include <QtCore/QList>
 
 
-template<typename T> class QList;
-
 class DynamicTreeModel : public QAbstractItemModel
 {
   Q_OBJECT
diff --git a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
index 79bb44c..889aac9 100644
--- a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
+++ b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
@@ -1,10 +1,22 @@
-TEMPLATE = subdirs
-CONFIG  += ordered
+load(qttest_p4)
+SOURCES += tst_qhelpcontentmodel.cpp
 
-contains(QT_BUILD_PARTS, tools): {
-	SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
-        	   ../../../tools/assistant/lib
-}
+CONFIG += help
 
-SUBDIRS += tst_qhelpcontentmodel.pro
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
 
+wince*: {   
+   DEFINES += SRCDIR=\\\"./\\\"
+   QT += network
+   addFiles.sources = $$PWD/data/*.*                
+   addFiles.path = data
+   clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll
+
+   DEPLOYMENT += addFiles
+   DEPLOYMENT += clucene
+   
+   DEPLOYMENT_PLUGIN += qsqlite
+} else {
+   DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
\ No newline at end of file
diff --git a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro
deleted file mode 100644
index 889aac9..0000000
--- a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_qhelpcontentmodel.cpp
-
-CONFIG += help
-
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
-
-wince*: {   
-   DEFINES += SRCDIR=\\\"./\\\"
-   QT += network
-   addFiles.sources = $$PWD/data/*.*                
-   addFiles.path = data
-   clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll
-
-   DEPLOYMENT += addFiles
-   DEPLOYMENT += clucene
-   
-   DEPLOYMENT_PLUGIN += qsqlite
-} else {
-   DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
\ No newline at end of file
diff --git a/tests/auto/qhelpenginecore/qhelpenginecore.pro b/tests/auto/qhelpenginecore/qhelpenginecore.pro
index ee9b0c4..27ebd0f 100644
--- a/tests/auto/qhelpenginecore/qhelpenginecore.pro
+++ b/tests/auto/qhelpenginecore/qhelpenginecore.pro
@@ -1,10 +1,23 @@
-TEMPLATE = subdirs
-CONFIG  += ordered
+load(qttest_p4)
+SOURCES += tst_qhelpenginecore.cpp
+CONFIG  += help
+QT      += sql
 
-contains(QT_BUILD_PARTS, tools): {
-	SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
-        	   ../../../tools/assistant/lib
-}
 
-SUBDIRS += tst_qhelpenginecore.pro
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
+
+wince*: {   
+   DEFINES += SRCDIR=\\\"./\\\"
+   QT += network
+   addFiles.sources = $$PWD/data/*.*                
+   addFiles.path = data
+   clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll
 
+   DEPLOYMENT += addFiles
+   DEPLOYMENT += clucene
+
+   DEPLOYMENT_PLUGIN += qsqlite
+} else {
+   DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro b/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro
deleted file mode 100644
index 27ebd0f..0000000
--- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_qhelpenginecore.cpp
-CONFIG  += help
-QT      += sql
-
-
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
-
-wince*: {   
-   DEFINES += SRCDIR=\\\"./\\\"
-   QT += network
-   addFiles.sources = $$PWD/data/*.*                
-   addFiles.path = data
-   clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll
-
-   DEPLOYMENT += addFiles
-   DEPLOYMENT += clucene
-
-   DEPLOYMENT_PLUGIN += qsqlite
-} else {
-   DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro
index efa1ef5..b4b07dd 100644
--- a/tests/auto/qhelpgenerator/qhelpgenerator.pro
+++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro
@@ -1,10 +1,9 @@
-TEMPLATE = subdirs
-CONFIG  += ordered
+load(qttest_p4)
 
-contains(QT_BUILD_PARTS, tools): {
-	SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
-        	   ../../../tools/assistant/lib
-}
-
-SUBDIRS += tst_qhelpgenerator.pro
+SOURCES += tst_qhelpgenerator.cpp
+CONFIG  += help
+QT      += sql
 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.pro b/tests/auto/qhelpgenerator/tst_qhelpgenerator.pro
deleted file mode 100644
index b4b07dd..0000000
--- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-SOURCES += tst_qhelpgenerator.cpp
-CONFIG  += help
-QT      += sql
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
index 1325e09..927c2e1 100644
--- a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
+++ b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
@@ -1,10 +1,9 @@
-TEMPLATE = subdirs
-CONFIG  += ordered
+load(qttest_p4)
 
-contains(QT_BUILD_PARTS, tools): {
-	SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
-        	   ../../../tools/assistant/lib
-}
-
-SUBDIRS += tst_qhelpindexmodel.pro
+SOURCES += tst_qhelpindexmodel.cpp
+CONFIG  += help
+QT      += sql
 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.pro b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.pro
deleted file mode 100644
index 927c2e1..0000000
--- a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-SOURCES += tst_qhelpindexmodel.cpp
-CONFIG  += help
-QT      += sql
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
index 9617416..92dc620 100644
--- a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
+++ b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
@@ -1,10 +1,9 @@
-TEMPLATE = subdirs
-CONFIG  += ordered
+load(qttest_p4)
 
-contains(QT_BUILD_PARTS, tools): {
-	SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
-        	   ../../../tools/assistant/lib
-}
+SOURCES += tst_qhelpprojectdata.cpp
+CONFIG  += help
 
-SUBDIRS += tst_qhelpprojectdata.pro
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
 
diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro
deleted file mode 100644
index 92dc620..0000000
--- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-SOURCES += tst_qhelpprojectdata.cpp
-CONFIG  += help
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
-
diff --git a/tests/auto/qlibrary/lib2/lib2.pro b/tests/auto/qlibrary/lib2/lib2.pro
index da30a2d..4654f4d 100644
--- a/tests/auto/qlibrary/lib2/lib2.pro
+++ b/tests/auto/qlibrary/lib2/lib2.pro
@@ -16,14 +16,19 @@ win32-borland: DEFINES += WIN32_BORLAND
 
 !symbian {
     win32 {
-        src = $(DESTDIR_TARGET)
+        # vcproj and Makefile generators refer to target differently
+        contains(TEMPLATE,vc.*) {
+            src = $(TargetPath)
+        } else {
+            src = $(DESTDIR_TARGET)
+        }
         files = mylib.dl2 system.trolltech.test.mylib.dll
     } else {
         src = $(DESTDIR)$(TARGET)
         files = libmylib.so2 system.trolltech.test.mylib.so
     }
     for(file, files) {
-        QMAKE_POST_LINK += $(COPY) $$src ..$$QMAKE_DIR_SEP$$file &&
+        QMAKE_POST_LINK += $$QMAKE_COPY $$src ..$$QMAKE_DIR_SEP$$file &&
         CLEAN_FILES += ../$$file
     }
     QMAKE_POST_LINK = $$member(QMAKE_POST_LINK, 0, -2)
diff --git a/tests/auto/qlocalsocket/lackey/main.cpp b/tests/auto/qlocalsocket/lackey/main.cpp
index 0f1930c..1bba4f8 100644
--- a/tests/auto/qlocalsocket/lackey/main.cpp
+++ b/tests/auto/qlocalsocket/lackey/main.cpp
@@ -172,8 +172,10 @@ static int _q_ScriptRegisterQObjectMetaType(QScriptEngine *engine, const QScript
     return qScriptRegisterMetaType<T*>(engine, _q_ScriptValueFromQObject<T>, _q_ScriptValueToQObject<T>, prototype);
 }
 
+QT_BEGIN_NAMESPACE
 Q_SCRIPT_DECLARE_QMETAOBJECT(QScriptLocalSocket, QObject*);
 Q_SCRIPT_DECLARE_QMETAOBJECT(QScriptLocalServer, QObject*);
+QT_END_NAMESPACE
 
 static void interactive(QScriptEngine &eng)
 {
diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
index a0f4339..f8951f5 100644
--- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
@@ -483,7 +483,9 @@ void tst_QPixmapCache::pixmapKey()
     QVERIFY(!getPrivate(key8));
 }
 
+QT_BEGIN_NAMESPACE
 extern int q_QPixmapCache_keyHashSize();
+QT_END_NAMESPACE
 
 void tst_QPixmapCache::noLeak()
 {
diff --git a/tests/auto/qpluginloader/theplugin/plugininterface.h b/tests/auto/qpluginloader/theplugin/plugininterface.h
index 0b093db..9b69429 100644
--- a/tests/auto/qpluginloader/theplugin/plugininterface.h
+++ b/tests/auto/qpluginloader/theplugin/plugininterface.h
@@ -45,7 +45,10 @@ struct PluginInterface {
     virtual ~PluginInterface() {}
     virtual QString pluginName() const = 0;
 };
+
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(PluginInterface, "com.trolltect.autotests.plugininterface/1.0")
+QT_END_NAMESPACE
 
 #endif // PLUGININTERFACE_H
 
diff --git a/tests/auto/qsharedmemory/qsharedmemory.pro b/tests/auto/qsharedmemory/qsharedmemory.pro
deleted file mode 100644
index 0aad554..0000000
--- a/tests/auto/qsharedmemory/qsharedmemory.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = lackey test qsystemlock
-
-
diff --git a/tests/auto/qsystemsemaphore/files.qrc b/tests/auto/qsystemsemaphore/files.qrc
deleted file mode 100644
index 7b344ba..0000000
--- a/tests/auto/qsystemsemaphore/files.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file alias="systemsemaphore_acquire.js">../qsharedmemory/lackey/scripts/systemsemaphore_acquire.js</file>
-    <file alias="systemsemaphore_release.js">../qsharedmemory/lackey/scripts/systemsemaphore_release.js</file>
-    <file alias="systemsemaphore_acquirerelease.js">../qsharedmemory/lackey/scripts/systemsemaphore_acquirerelease.js</file>
-</qresource>
-</RCC>
diff --git a/tests/auto/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/qsystemsemaphore/qsystemsemaphore.pro
deleted file mode 100644
index a3f4a34..0000000
--- a/tests/auto/qsystemsemaphore/qsystemsemaphore.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = ../qsharedmemory/lackey test
-
-
diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp
index 8ff6bee..9146be2 100644
--- a/tests/auto/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/qtextstream/tst_qtextstream.cpp
@@ -4308,10 +4308,15 @@ void tst_QTextStream::int_write_with_locale()
 // ------------------------------------------------------------------------------
 
 // like QTEST_APPLESS_MAIN, but initialising the locale on Unix
+#if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN)
+QT_BEGIN_NAMESPACE
+extern bool qt_locale_initialized;
+QT_END_NAMESPACE
+#endif
+
 int main(int argc, char *argv[])
 {
 #if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN)
-    extern bool qt_locale_initialized;
     ::setlocale(LC_ALL, "");
     qt_locale_initialized = true;
 #endif
diff --git a/tests/auto/qsharedmemory/lackey/lackey.pro b/tests/auto/qtipc/lackey/lackey.pro
index d25a50a..3912312 100644
--- a/tests/auto/qsharedmemory/lackey/lackey.pro
+++ b/tests/auto/qtipc/lackey/lackey.pro
@@ -1,4 +1,4 @@
-include(../src/src.pri)
+include(../qsharedmemory/src/src.pri)
 
 QT = core script
 
diff --git a/tests/auto/qsharedmemory/lackey/main.cpp b/tests/auto/qtipc/lackey/main.cpp
index 5a5bf5e..fef8d22 100644
--- a/tests/auto/qsharedmemory/lackey/main.cpp
+++ b/tests/auto/qtipc/lackey/main.cpp
@@ -242,9 +242,11 @@ private:
     QSharedMemory sm;
 };
 
+QT_BEGIN_NAMESPACE
 Q_SCRIPT_DECLARE_QMETAOBJECT(ScriptSharedMemory, QObject*);
 Q_SCRIPT_DECLARE_QMETAOBJECT(ScriptSystemLock, QObject*);
 Q_SCRIPT_DECLARE_QMETAOBJECT(ScriptSystemSemaphore, QObject*);
+QT_END_NAMESPACE
 
 static void interactive(QScriptEngine &eng)
 {
diff --git a/tests/auto/qsharedmemory/lackey/scripts/consumer.js b/tests/auto/qtipc/lackey/scripts/consumer.js
index 4d12dca..4d12dca 100644
--- a/tests/auto/qsharedmemory/lackey/scripts/consumer.js
+++ b/tests/auto/qtipc/lackey/scripts/consumer.js
diff --git a/tests/auto/qsharedmemory/lackey/scripts/producer.js b/tests/auto/qtipc/lackey/scripts/producer.js
index e02cd8b..e02cd8b 100644
--- a/tests/auto/qsharedmemory/lackey/scripts/producer.js
+++ b/tests/auto/qtipc/lackey/scripts/producer.js
diff --git a/tests/auto/qsharedmemory/lackey/scripts/readonly_segfault.js b/tests/auto/qtipc/lackey/scripts/readonly_segfault.js
index 3eaf789..3eaf789 100644
--- a/tests/auto/qsharedmemory/lackey/scripts/readonly_segfault.js
+++ b/tests/auto/qtipc/lackey/scripts/readonly_segfault.js
diff --git a/tests/auto/qsharedmemory/lackey/scripts/systemlock_read.js b/tests/auto/qtipc/lackey/scripts/systemlock_read.js
index 1048bc7..1048bc7 100644
--- a/tests/auto/qsharedmemory/lackey/scripts/systemlock_read.js
+++ b/tests/auto/qtipc/lackey/scripts/systemlock_read.js
diff --git a/tests/auto/qsharedmemory/lackey/scripts/systemlock_readwrite.js b/tests/auto/qtipc/lackey/scripts/systemlock_readwrite.js
index fc6367f..fc6367f 100644
--- a/tests/auto/qsharedmemory/lackey/scripts/systemlock_readwrite.js
+++ b/tests/auto/qtipc/lackey/scripts/systemlock_readwrite.js
diff --git a/tests/auto/qsharedmemory/lackey/scripts/systemsemaphore_acquire.js b/tests/auto/qtipc/lackey/scripts/systemsemaphore_acquire.js
index 5cff429..5cff429 100644
--- a/tests/auto/qsharedmemory/lackey/scripts/systemsemaphore_acquire.js
+++ b/tests/auto/qtipc/lackey/scripts/systemsemaphore_acquire.js
diff --git a/tests/auto/qsharedmemory/lackey/scripts/systemsemaphore_acquirerelease.js b/tests/auto/qtipc/lackey/scripts/systemsemaphore_acquirerelease.js
index cedde3f..cedde3f 100644
--- a/tests/auto/qsharedmemory/lackey/scripts/systemsemaphore_acquirerelease.js
+++ b/tests/auto/qtipc/lackey/scripts/systemsemaphore_acquirerelease.js
diff --git a/tests/auto/qsharedmemory/lackey/scripts/systemsemaphore_release.js b/tests/auto/qtipc/lackey/scripts/systemsemaphore_release.js
index c805e0f..c805e0f 100644
--- a/tests/auto/qsharedmemory/lackey/scripts/systemsemaphore_release.js
+++ b/tests/auto/qtipc/lackey/scripts/systemsemaphore_release.js
diff --git a/tests/auto/qsharedmemory/.gitignore b/tests/auto/qtipc/qsharedmemory/.gitignore
index 03ddcf2..03ddcf2 100644
--- a/tests/auto/qsharedmemory/.gitignore
+++ b/tests/auto/qtipc/qsharedmemory/.gitignore
diff --git a/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro b/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro
new file mode 100644
index 0000000..9fef8e4
--- /dev/null
+++ b/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+SUBDIRS = test qsystemlock
+
+
diff --git a/tests/auto/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
index e232443..e232443 100644
--- a/tests/auto/qsharedmemory/qsystemlock/qsystemlock.pro
+++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
diff --git a/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp b/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
index ea906b7..ea906b7 100644
--- a/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
+++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
diff --git a/tests/auto/qsharedmemory/src/qsystemlock.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
index 4ead748..4ead748 100644
--- a/tests/auto/qsharedmemory/src/qsystemlock.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
diff --git a/tests/auto/qsharedmemory/src/qsystemlock.h b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h
index 7cd6b89..7cd6b89 100644
--- a/tests/auto/qsharedmemory/src/qsystemlock.h
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h
diff --git a/tests/auto/qsharedmemory/src/qsystemlock_p.h b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h
index 7995a91..7995a91 100644
--- a/tests/auto/qsharedmemory/src/qsystemlock_p.h
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h
diff --git a/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
index 525aa78..525aa78 100644
--- a/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
diff --git a/tests/auto/qsharedmemory/src/qsystemlock_win.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
index ac97100..ac97100 100644
--- a/tests/auto/qsharedmemory/src/qsystemlock_win.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
diff --git a/tests/auto/qsharedmemory/src/src.pri b/tests/auto/qtipc/qsharedmemory/src/src.pri
index 5bc9de6..5bc9de6 100644
--- a/tests/auto/qsharedmemory/src/src.pri
+++ b/tests/auto/qtipc/qsharedmemory/src/src.pri
diff --git a/tests/auto/qsharedmemory/test/test.pro b/tests/auto/qtipc/qsharedmemory/test/test.pro
index c9f4fec..40ba8b9 100644
--- a/tests/auto/qsharedmemory/test/test.pro
+++ b/tests/auto/qtipc/qsharedmemory/test/test.pro
@@ -20,14 +20,14 @@ TARGET = ../tst_qsharedmemory
 wince*:{
 requires(contains(QT_CONFIG,script))
 QT += gui script
-addFiles.sources = ../lackey/lackey.exe ../lackey/scripts
+addFiles.sources = ../../lackey/lackey.exe ../../lackey/scripts
 addFiles.path = lackey
 DEPLOYMENT += addFiles
 DEFINES += SRCDIR=\\\"\\\"
 }else:symbian*{
 requires(contains(QT_CONFIG,script))
 QT += gui script
-addFiles.sources = ../lackey/scripts
+addFiles.sources = ../../lackey/scripts
 addFiles.path = /data/qsharedmemorytemp/lackey
 addBin.sources = lackey.exe
 addBin.path = /sys/bin
diff --git a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
index cea75bf..83f65b0 100644
--- a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
@@ -51,7 +51,13 @@
 
 #ifdef Q_OS_SYMBIAN
 #define SRCDIR "c:/data/qsharedmemorytemp/"
+#define LACKEYDIR SRCDIR "lackey"
+#elif Q_OS_WINCE
+#define LACKEYDIR SRCDIR "lackey"
+#else
+#define LACKEYDIR SRCDIR "../lackey"
 #endif
+
 Q_DECLARE_METATYPE(QSharedMemory::SharedMemoryError)
 Q_DECLARE_METATYPE(QSharedMemory::AccessMode)
 
@@ -411,10 +417,10 @@ void tst_QSharedMemory::readOnly()
 #if defined (Q_OS_SYMBIAN)
     QSKIP("Readonly shared memory is not supported in symbian", SkipAll);
 #endif
-    QString program = "./lackey/lackey";
+    QString program = LACKEYDIR "/lackey";
     QStringList arguments;
     rememberKey("readonly_segfault");
-    arguments << SRCDIR "lackey/scripts/readonly_segfault.js";
+    arguments << LACKEYDIR "/scripts/readonly_segfault.js";
 
     // ### on windows disable the popup somehow
     QProcess p;
@@ -727,28 +733,20 @@ void tst_QSharedMemory::simpleProcessProducerConsumer()
 
     rememberKey("market");
 
-#ifndef Q_OS_WINCE
-    QStringList arguments = QStringList() << SRCDIR "lackey/scripts/producer.js";
-#else
-    QStringList arguments = QStringList() << QFileInfo(SRCDIR "lackey/scripts/producer.js").absoluteFilePath();
-#endif
+    QStringList arguments = QStringList() << LACKEYDIR "/scripts/producer.js";
     QProcess producer;
     producer.setProcessChannelMode(QProcess::ForwardedChannels);
-    producer.start( "./lackey/lackey", arguments);
+    producer.start( LACKEYDIR "/lackey", arguments);
     producer.waitForStarted();
     QVERIFY(producer.error() != QProcess::FailedToStart);
 
     QList<QProcess*> consumers;
     unsigned int failedProcesses = 0;
     for (int i = 0; i < processes; ++i) {
-#ifndef Q_OS_WINCE
-        QStringList arguments = QStringList() << SRCDIR  "lackey/scripts/consumer.js";
-#else
-        QStringList arguments = QStringList() << QFileInfo(SRCDIR "lackey/scripts/consumer.js").absoluteFilePath();
-#endif
+        QStringList arguments = QStringList() << LACKEYDIR  "/scripts/consumer.js";
         QProcess *p = new QProcess;
         p->setProcessChannelMode(QProcess::ForwardedChannels);
-        p->start("./lackey/lackey", arguments);
+        p->start(LACKEYDIR "/lackey", arguments);
 
         if (p->waitForStarted(2000))
             consumers.append(p);
diff --git a/tests/auto/qsystemsemaphore/.gitignore b/tests/auto/qtipc/qsystemsemaphore/.gitignore
index 2b60bfb..2b60bfb 100644
--- a/tests/auto/qsystemsemaphore/.gitignore
+++ b/tests/auto/qtipc/qsystemsemaphore/.gitignore
diff --git a/tests/auto/qtipc/qsystemsemaphore/files.qrc b/tests/auto/qtipc/qsystemsemaphore/files.qrc
new file mode 100644
index 0000000..6296690
--- /dev/null
+++ b/tests/auto/qtipc/qsystemsemaphore/files.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file alias="systemsemaphore_acquire.js">../lackey/scripts/systemsemaphore_acquire.js</file>
+    <file alias="systemsemaphore_release.js">../lackey/scripts/systemsemaphore_release.js</file>
+    <file alias="systemsemaphore_acquirerelease.js">../lackey/scripts/systemsemaphore_acquirerelease.js</file>
+</qresource>
+</RCC>
diff --git a/tests/auto/qsystemsemaphore/test/test.pro b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro
index ed7898c..1f9205e 100644
--- a/tests/auto/qsystemsemaphore/test/test.pro
+++ b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro
@@ -1,29 +1,24 @@
 CONFIG += qttest_p4
 #QT = core
 
-include(../../qsharedmemory/src/src.pri)
+include(../qsharedmemory/src/src.pri)
 win32: CONFIG += console
 
 DEFINES	+= QSHAREDMEMORY_DEBUG
 DEFINES	+= QSYSTEMSEMAPHORE_DEBUG
 
-SOURCES		+= ../tst_qsystemsemaphore.cpp 
+SOURCES		+= tst_qsystemsemaphore.cpp 
 TARGET		= tst_qsystemsemaphore
-DESTDIR		= ../
-win32 {
-    CONFIG(debug, debug|release): DESTDIR = ../debug
-    else: DESTDIR = ../release
-}
 
-RESOURCES += ../files.qrc
+RESOURCES += files.qrc
 
 wince*: {
 requires(contains(QT_CONFIG,script))
 # this test calls lackey, which then again depends on QtScript.
 # let's add it here so that it gets deployed easily
 QT += script
-lackey.sources = ../../qsharedmemory/lackey/lackey.exe
-lackey.path = ../qsharedmemory/lackey
+lackey.sources = ../lackey/lackey.exe
+lackey.path = ../lackey
 
 DEPLOYMENT += lackey
 }
@@ -34,7 +29,8 @@ requires(contains(QT_CONFIG,script))
 # let's add it here so that it gets deployed easily
 QT += script
 
-lackey.sources = ../../qsharedmemory/lackey/lackey.exe
+lackey.sources = ../lackey/lackey.exe
 lackey.path = /sys/bin
 DEPLOYMENT += lackey
 }
+
diff --git a/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
index bf4efdc..eb82fd4 100644
--- a/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp
+++ b/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
@@ -46,7 +46,7 @@
 //TESTED_FILES=
 
 #define EXISTING_SHARE "existing"
-#define LACKYLOC "../qsharedmemory/lackey"
+#define LACKYLOC "../lackey"
 #define LACKYWAITTIME 10000
 
 class tst_QSystemSemaphore : public QObject
diff --git a/tests/auto/qtipc/qtipc.pro b/tests/auto/qtipc/qtipc.pro
new file mode 100644
index 0000000..60037d2
--- /dev/null
+++ b/tests/auto/qtipc/qtipc.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    lackey \
+    qsharedmemory \
+    qsystemsemaphore \
+
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 21b2fe3..a316dda 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -3200,7 +3200,10 @@ struct MyPrimitive
         return x == o.x && y == o.y;
     }
 };
+
+QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE);
+QT_END_NAMESPACE
 
 struct MyData
 {
@@ -3239,7 +3242,9 @@ struct MyMovable
 int MyMovable::count  = 0;
 
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
+QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QList<QSize>)
 Q_DECLARE_METATYPE(MyPrimitive)
diff --git a/tests/auto/xmlpatternsdiagnosticsts/test/test.pro b/tests/auto/xmlpatternsdiagnosticsts/test/test.pro
deleted file mode 100644
index acd71e4..0000000
--- a/tests/auto/xmlpatternsdiagnosticsts/test/test.pro
+++ /dev/null
@@ -1,32 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_xmlpatternsdiagnosticsts.cpp \
-           ../../qxmlquery/TestFundament.cpp
-
-include (../../xmlpatterns.pri)
-
-TARGET = tst_xmlpatternsdiagnosticsts
-DESTDIR = ..
-win32 {
-    CONFIG(debug, debug|release): DESTDIR = ../debug
-    else: DESTDIR = ../release
-}
-
-contains(QT_CONFIG, xmlpatterns) {
-HEADERS += ../../xmlpatternsxqts/test/tst_suitetest.h
-SOURCES += ../../xmlpatternsxqts/test/tst_suitetest.cpp
-LIBS += -l$$XMLPATTERNS_SDK
-}
-
-QT += xml
-
-INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternsxqts/lib/ \
-               $$(QTDIR)/include/QtXmlPatterns/private      \
-               $$(QTSRCDIR)/tests/auto/xmlpatternsxqts/test \
-               ../../xmlpatternsxqts/test                   \
-               ../../xmlpatternsxqts/lib
-
-wince*|symbian {
-   catalog.sources = ../TestSuite ../Baseline.xml
-   catalog.path = .
-   DEPLOYMENT += catalog
-}
diff --git a/tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
index 4a11404..4a11404 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp
+++ b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
index 3d82eaf..981adab 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
+++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
@@ -1,5 +1,27 @@
-TEMPLATE = subdirs
-CONFIG += ordered
+load(qttest_p4)
+SOURCES += tst_xmlpatternsdiagnosticsts.cpp \
+           ../qxmlquery/TestFundament.cpp
 
-SUBDIRS = ../xmlpatternsxqts test
-requires(contains(QT_CONFIG,private_tests))
+include (../xmlpatterns.pri)
+
+TARGET = tst_xmlpatternsdiagnosticsts
+
+contains(QT_CONFIG, xmlpatterns) {
+HEADERS += ../xmlpatternsxqts/tst_suitetest.h
+SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp
+LIBS += -l$$XMLPATTERNS_SDK
+}
+
+QT += xml
+
+INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk  \
+               $$(QTDIR)/include/QtXmlPatterns/private \
+               $$(QTSRCDIR)/tests/auto/xmlpatternsxqts \
+               ../xmlpatternsxqts                      \
+               ../xmlpatternssdk
+
+wince*|symbian {
+   catalog.sources = TestSuite Baseline.xml
+   catalog.path = .
+   DEPLOYMENT += catalog
+}
diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
index 0f55078..f36211e 100644
--- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
+++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
@@ -5,8 +5,8 @@ SOURCES += tst_xmlpatternsschemats.cpp \
 include (../xmlpatterns.pri)
 
 contains(QT_CONFIG,xmlpatterns) {
-HEADERS += ../xmlpatternsxqts/test/tst_suitetest.h
-SOURCES += ../xmlpatternsxqts/test/tst_suitetest.cpp
+HEADERS += ../xmlpatternsxqts/tst_suitetest.h
+SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp
 }
 
 PATTERNIST_SDK = QtXmlPatternsSDK
@@ -20,8 +20,8 @@ LIBS += -l$$PATTERNIST_SDK
 
 QT += xml
 
-INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto/xmlpatternsxqts/lib/ \
-               $$QT_BUILD_TREE/include/QtXmlPatterns/private      \
-               $$QT_SOURCE_TREE/tests/auto/xmlpatternsxqts/test \
-               ../xmlpatternsxqts/test                      \
-               ../xmlpatternsxqts/lib
+INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto/xmlpatternssdk/   \
+               $$QT_BUILD_TREE/include/QtXmlPatterns/private \
+               $$QT_SOURCE_TREE/tests/auto/xmlpatternsxqts   \
+               ../xmlpatternsxqts                            \
+               ../xmlpatternssdk
diff --git a/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp b/tests/auto/xmlpatternssdk/ASTItem.cpp
index 3b4fbdc..3b4fbdc 100644
--- a/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp
+++ b/tests/auto/xmlpatternssdk/ASTItem.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/ASTItem.h b/tests/auto/xmlpatternssdk/ASTItem.h
index ca3ac8f..ca3ac8f 100644
--- a/tests/auto/xmlpatternsxqts/lib/ASTItem.h
+++ b/tests/auto/xmlpatternssdk/ASTItem.h
diff --git a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
index 1b5121e..1b5121e 100644
--- a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
index d5e676d..d5e676d 100644
--- a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp b/tests/auto/xmlpatternssdk/ErrorHandler.cpp
index 3f07737..3f07737 100644
--- a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp
+++ b/tests/auto/xmlpatternssdk/ErrorHandler.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h b/tests/auto/xmlpatternssdk/ErrorHandler.h
index 25447a9..25447a9 100644
--- a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h
+++ b/tests/auto/xmlpatternssdk/ErrorHandler.h
diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp b/tests/auto/xmlpatternssdk/ErrorItem.cpp
index 57edc1f..57edc1f 100644
--- a/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp
+++ b/tests/auto/xmlpatternssdk/ErrorItem.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorItem.h b/tests/auto/xmlpatternssdk/ErrorItem.h
index 1d05872..1d05872 100644
--- a/tests/auto/xmlpatternsxqts/lib/ErrorItem.h
+++ b/tests/auto/xmlpatternssdk/ErrorItem.h
diff --git a/tests/auto/xmlpatternsxqts/lib/ExitCode.h b/tests/auto/xmlpatternssdk/ExitCode.h
index e1810b1..e1810b1 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExitCode.h
+++ b/tests/auto/xmlpatternssdk/ExitCode.h
diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
index abbc8b3..abbc8b3 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h
index 2d9d398..2d9d398 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h
diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
index 605c754..605c754 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp
+++ b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h b/tests/auto/xmlpatternssdk/ExpressionNamer.h
index 129d8d7..129d8d7 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h
+++ b/tests/auto/xmlpatternssdk/ExpressionNamer.h
diff --git a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
index a83a100..a83a100 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
index 2d88222..2d88222 100644
--- a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
diff --git a/tests/auto/xmlpatternsxqts/lib/Global.cpp b/tests/auto/xmlpatternssdk/Global.cpp
index f78e421..f78e421 100644
--- a/tests/auto/xmlpatternsxqts/lib/Global.cpp
+++ b/tests/auto/xmlpatternssdk/Global.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/Global.h b/tests/auto/xmlpatternssdk/Global.h
index 53c32cb..53c32cb 100644
--- a/tests/auto/xmlpatternsxqts/lib/Global.h
+++ b/tests/auto/xmlpatternssdk/Global.h
diff --git a/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp b/tests/auto/xmlpatternssdk/ResultThreader.cpp
index 3296854..3296854 100644
--- a/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp
+++ b/tests/auto/xmlpatternssdk/ResultThreader.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/ResultThreader.h b/tests/auto/xmlpatternssdk/ResultThreader.h
index 19749f0..19749f0 100644
--- a/tests/auto/xmlpatternsxqts/lib/ResultThreader.h
+++ b/tests/auto/xmlpatternssdk/ResultThreader.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp b/tests/auto/xmlpatternssdk/TestBaseLine.cpp
index 6a46bcc..6a46bcc 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp
+++ b/tests/auto/xmlpatternssdk/TestBaseLine.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.h b/tests/auto/xmlpatternssdk/TestBaseLine.h
index e297128..e297128 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.h
+++ b/tests/auto/xmlpatternssdk/TestBaseLine.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestCase.cpp b/tests/auto/xmlpatternssdk/TestCase.cpp
index 7b424d2..7b424d2 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestCase.cpp
+++ b/tests/auto/xmlpatternssdk/TestCase.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TestCase.h b/tests/auto/xmlpatternssdk/TestCase.h
index 28df5f1..28df5f1 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestCase.h
+++ b/tests/auto/xmlpatternssdk/TestCase.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp b/tests/auto/xmlpatternssdk/TestContainer.cpp
index ec6196c..ec6196c 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp
+++ b/tests/auto/xmlpatternssdk/TestContainer.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TestContainer.h b/tests/auto/xmlpatternssdk/TestContainer.h
index 5b93491..5b93491 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestContainer.h
+++ b/tests/auto/xmlpatternssdk/TestContainer.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp b/tests/auto/xmlpatternssdk/TestGroup.cpp
index f2cd2bd..f2cd2bd 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp
+++ b/tests/auto/xmlpatternssdk/TestGroup.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TestGroup.h b/tests/auto/xmlpatternssdk/TestGroup.h
index 5f4798f..5f4798f 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestGroup.h
+++ b/tests/auto/xmlpatternssdk/TestGroup.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestItem.h b/tests/auto/xmlpatternssdk/TestItem.h
index 0b3c606..0b3c606 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestItem.h
+++ b/tests/auto/xmlpatternssdk/TestItem.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestResult.cpp b/tests/auto/xmlpatternssdk/TestResult.cpp
index 2374bc0..2374bc0 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestResult.cpp
+++ b/tests/auto/xmlpatternssdk/TestResult.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TestResult.h b/tests/auto/xmlpatternssdk/TestResult.h
index 6951f90..6951f90 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestResult.h
+++ b/tests/auto/xmlpatternssdk/TestResult.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp b/tests/auto/xmlpatternssdk/TestResultHandler.cpp
index b87d481..b87d481 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp
+++ b/tests/auto/xmlpatternssdk/TestResultHandler.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.h b/tests/auto/xmlpatternssdk/TestResultHandler.h
index a786ac4..a786ac4 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.h
+++ b/tests/auto/xmlpatternssdk/TestResultHandler.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp b/tests/auto/xmlpatternssdk/TestSuite.cpp
index 2c3e49c..2c3e49c 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
+++ b/tests/auto/xmlpatternssdk/TestSuite.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuite.h b/tests/auto/xmlpatternssdk/TestSuite.h
index d14dc62..d14dc62 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuite.h
+++ b/tests/auto/xmlpatternssdk/TestSuite.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
index 7c687f3..7c687f3 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
index 76156c0..76156c0 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp b/tests/auto/xmlpatternssdk/TestSuiteResult.cpp
index 4e81859..4e81859 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp
+++ b/tests/auto/xmlpatternssdk/TestSuiteResult.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h b/tests/auto/xmlpatternssdk/TestSuiteResult.h
index 491c2b2..491c2b2 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteResult.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp b/tests/auto/xmlpatternssdk/TreeItem.cpp
index b34262d..b34262d 100644
--- a/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp
+++ b/tests/auto/xmlpatternssdk/TreeItem.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TreeItem.h b/tests/auto/xmlpatternssdk/TreeItem.h
index f5e051f..f5e051f 100644
--- a/tests/auto/xmlpatternsxqts/lib/TreeItem.h
+++ b/tests/auto/xmlpatternssdk/TreeItem.h
diff --git a/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp b/tests/auto/xmlpatternssdk/TreeModel.cpp
index e27f8e0..e27f8e0 100644
--- a/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp
+++ b/tests/auto/xmlpatternssdk/TreeModel.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/TreeModel.h b/tests/auto/xmlpatternssdk/TreeModel.h
index 1d8ea72..1d8ea72 100644
--- a/tests/auto/xmlpatternsxqts/lib/TreeModel.h
+++ b/tests/auto/xmlpatternssdk/TreeModel.h
diff --git a/tests/auto/xmlpatternsxqts/lib/Worker.cpp b/tests/auto/xmlpatternssdk/Worker.cpp
index 0121099..0121099 100644
--- a/tests/auto/xmlpatternsxqts/lib/Worker.cpp
+++ b/tests/auto/xmlpatternssdk/Worker.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/Worker.h b/tests/auto/xmlpatternssdk/Worker.h
index b3d7ae2..b3d7ae2 100644
--- a/tests/auto/xmlpatternsxqts/lib/Worker.h
+++ b/tests/auto/xmlpatternssdk/Worker.h
diff --git a/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp b/tests/auto/xmlpatternssdk/XMLWriter.cpp
index 60a5344..60a5344 100644
--- a/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp
+++ b/tests/auto/xmlpatternssdk/XMLWriter.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/XMLWriter.h b/tests/auto/xmlpatternssdk/XMLWriter.h
index 2b629bb..2b629bb 100644
--- a/tests/auto/xmlpatternsxqts/lib/XMLWriter.h
+++ b/tests/auto/xmlpatternssdk/XMLWriter.h
diff --git a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp b/tests/auto/xmlpatternssdk/XQTSTestCase.cpp
index 6a8645b..6a8645b 100644
--- a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp
+++ b/tests/auto/xmlpatternssdk/XQTSTestCase.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h b/tests/auto/xmlpatternssdk/XQTSTestCase.h
index 8872b32..8872b32 100644
--- a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XQTSTestCase.h
diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.cpp b/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
index 3cbb681..3cbb681 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.cpp
+++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
index 8cfa143..947687a 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
@@ -50,6 +50,7 @@
 #include "TestCase.h"
 
 QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
 {
@@ -153,6 +154,7 @@ namespace QPatternistSDK
     };
 }
 
+QT_END_NAMESPACE
 QT_END_HEADER
 
 #endif
diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
index a868d19..a868d19 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
index 9179a2d..5493c7d 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
@@ -50,6 +50,7 @@
 #include "XQTSTestCase.h"
 
 QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
 {
@@ -113,6 +114,7 @@ namespace QPatternistSDK
     };
 }
 
+QT_END_NAMESPACE
 QT_END_HEADER
 
 #endif
diff --git a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
index cfc3b2b..cfc3b2b 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
index 8614789..8614789 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExample.cpp b/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
index 24ee158..24ee158 100644
--- a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExample.cpp
+++ b/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExampleResult.xml b/tests/auto/xmlpatternssdk/docs/XMLIndenterExampleResult.xml
index c5e7312..c5e7312 100644
--- a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExampleResult.xml
+++ b/tests/auto/xmlpatternssdk/docs/XMLIndenterExampleResult.xml
diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExample.cpp b/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
index 24ee158..24ee158 100644
--- a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExample.cpp
+++ b/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExampleResult.xml b/tests/auto/xmlpatternssdk/docs/XMLWriterExampleResult.xml
index c5e7312..c5e7312 100644
--- a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExampleResult.xml
+++ b/tests/auto/xmlpatternssdk/docs/XMLWriterExampleResult.xml
diff --git a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
index a10c01a..a10c01a 100644
--- a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
+++ b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
diff --git a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
index f90aea2..f90aea2 100644
--- a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h
+++ b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
diff --git a/tests/auto/xmlpatternsxqts/lib/lib.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
index f5b0a06..6204f01 100644
--- a/tests/auto/xmlpatternsxqts/lib/lib.pro
+++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
@@ -1,4 +1,4 @@
-include (../../xmlpatterns.pri)
+include (../xmlpatterns.pri)
 
 TARGET   = $$XMLPATTERNS_SDK
 TEMPLATE = lib
diff --git a/tests/auto/xmlpatternsview/test/test.pro b/tests/auto/xmlpatternsview/test/test.pro
deleted file mode 100644
index 6adff4d..0000000
--- a/tests/auto/xmlpatternsview/test/test.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_xmlpatternsview.cpp
-
-include (../../xmlpatterns.pri)
-
-DESTDIR = ..
-win32 {
-    CONFIG(debug, debug|release): DESTDIR = ../debug
-    else: DESTDIR = ../release
-}
-TARGET = tst_xmlpatternsview
-
-wince*: {
-    viewexe.sources = $$QT_BUILD_TREE/xmlpatternsview.exe
-    viewexe.path = .
-    DEPLOYMENT += viewexe
-}
diff --git a/tests/auto/xmlpatternsview/test/tst_xmlpatternsview.cpp b/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
index 91dee63..91dee63 100644
--- a/tests/auto/xmlpatternsview/test/tst_xmlpatternsview.cpp
+++ b/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
diff --git a/tests/auto/xmlpatternsview/xmlpatternsview.pro b/tests/auto/xmlpatternsview/xmlpatternsview.pro
index 04ee4d0..d93cba3 100644
--- a/tests/auto/xmlpatternsview/xmlpatternsview.pro
+++ b/tests/auto/xmlpatternsview/xmlpatternsview.pro
@@ -1,9 +1,12 @@
-TEMPLATE = subdirs
-CONFIG += ordered
+load(qttest_p4)
+SOURCES += tst_xmlpatternsview.cpp
 
-SUBDIRS = ../xmlpatternsxqts test
+include (../xmlpatterns.pri)
 
-contains(QT_CONFIG,xmlpatterns) {
-  SUBDIRS += view
+TARGET = tst_xmlpatternsview
+
+wince*: {
+    viewexe.sources = $$QT_BUILD_TREE/xmlpatternsview.exe
+    viewexe.path = .
+    DEPLOYMENT += viewexe
 }
-requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/xmlpatternsxqts/test/test.pro b/tests/auto/xmlpatternsxqts/test/test.pro
deleted file mode 100644
index a69838a..0000000
--- a/tests/auto/xmlpatternsxqts/test/test.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_xmlpatternsxqts.cpp ../../qxmlquery/TestFundament.cpp tst_suitetest.cpp
-
-include(../../xmlpatterns.pri)
-
-contains(QT_CONFIG,xmlpatterns) {
-    HEADERS += tst_suitetest.h
-    LIBS += -l$$XMLPATTERNS_SDK
-}
-
-# syncqt doesn't copy headers in tools/ so let's manually ensure
-# it works with shadow builds and source builds.
-INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private      \
-               $$(QTSRCDIR)/include/QtXmlPatterns/private   \
-               $$(QTSRCDIR)/tools/xmlpatterns               \
-               $$(QTDIR)/tools/xmlpatterns                  \
-               ../lib/
-
-CONFIG += testlib
-QT += xml
-DESTDIR = ..
-win32 {
-    CONFIG(debug, debug|release): DESTDIR = ../debug
-    else: DESTDIR = ../release
-}
-TARGET = tst_xmlpatternsxqts
diff --git a/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
index 64120c7..64120c7 100644
--- a/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
diff --git a/tests/auto/xmlpatternsxqts/test/tst_suitetest.h b/tests/auto/xmlpatternsxqts/tst_suitetest.h
index 22e384a..70e56af 100644
--- a/tests/auto/xmlpatternsxqts/test/tst_suitetest.h
+++ b/tests/auto/xmlpatternsxqts/tst_suitetest.h
@@ -44,7 +44,7 @@
 #define Q_tst_SuiteTest
 
 #include <QtCore/QObject>
-#include "../../qxmlquery/TestFundament.h"
+#include "../qxmlquery/TestFundament.h"
 
 /*!
  \class tst_SuiteTest
diff --git a/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
index 890234e..890234e 100644
--- a/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
index 3f49ccc..e81888a 100644
--- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
+++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
@@ -1,13 +1,21 @@
-TEMPLATE = subdirs
+load(qttest_p4)
+SOURCES += tst_xmlpatternsxqts.cpp ../qxmlquery/TestFundament.cpp tst_suitetest.cpp
+
+include(../xmlpatterns.pri)
+
 contains(QT_CONFIG,xmlpatterns) {
-  SUBDIRS += lib
-  test.depends = lib
+    HEADERS += tst_suitetest.h
+    LIBS += -l$$XMLPATTERNS_SDK
 }
-SUBDIRS += test
-
-# Needed on the win32-g++ setup and on the test machine arsia.
-INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private \
-               ../../../include/QtXmlPatterns/private
 
-requires(contains(QT_CONFIG,private_tests))
+# syncqt doesn't copy headers in tools/ so let's manually ensure
+# it works with shadow builds and source builds.
+INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private      \
+               $$(QTSRCDIR)/include/QtXmlPatterns/private   \
+               $$(QTSRCDIR)/tools/xmlpatterns               \
+               $$(QTDIR)/tools/xmlpatterns                  \
+               ../xmlpatternssdk/
 
+CONFIG += testlib
+QT += xml
+TARGET = tst_xmlpatternsxqts
diff --git a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
index 9b63a52..940cc31 100644
--- a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
+++ b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
@@ -5,17 +5,17 @@ SOURCES += tst_xmlpatternsxslts.cpp \
 include (../xmlpatterns.pri)
 
 contains(QT_CONFIG,xmlpatterns) {
-HEADERS += ../xmlpatternsxqts/test/tst_suitetest.h
-SOURCES += ../xmlpatternsxqts/test/tst_suitetest.cpp
+HEADERS += ../xmlpatternsxqts/tst_suitetest.h
+SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp
 LIBS += -l$$XMLPATTERNS_SDK
 }
 
 QT += xml
-INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternsxqts/lib/ \
-               $$(QTDIR)/include/QtXmlPatterns/private      \
-               $$(QTSRCDIR)/tests/auto/xmlpatternsxqts/test \
-               ../xmlpatternsxqts/test                      \
-               ../xmlpatternsxqts/lib
+INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk  \
+               $$(QTDIR)/include/QtXmlPatterns/private \
+               $$(QTSRCDIR)/tests/auto/xmlpatternsxqts \
+               ../xmlpatternsxqts                      \
+               ../xmlpatternssdk
 
 wince*: {
     testdata.sources = XSLTS Baseline.xml