Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 17 insertions, 9 deletions

diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp b/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
index 34334ec..9122860 100644
--- a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
+++ b/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
@@ -91,6 +91,7 @@
 #include "TestSuiteResult.h"
 #include "XMLWriter.h"
 #include "XSLTTestSuiteHandler.h"
+#include "XSDTestSuiteHandler.h"
 #include "qdebug_p.h"
 
 #include "TestSuite.h"
@@ -132,7 +133,7 @@ TestSuiteResult *TestSuite::runSuite()
 TestSuite *TestSuite::openCatalog(const QUrl &catalogURI,
                                   QString &errorMsg,
                                   const bool useExclusionList,
-                                  const bool isXSLTCatalog)
+                                  SuiteType suiteType)
 {
     pDebug() << "Opening catalog:" << catalogURI.toString();
     QFile ts(catalogURI.toLocalFile());
@@ -167,14 +168,14 @@ TestSuite *TestSuite::openCatalog(const QUrl &catalogURI,
         return 0;
     }
 
-    return openCatalog(&ts, errorMsg, catalogURI, useExclusionList, isXSLTCatalog);
+    return openCatalog(&ts, errorMsg, catalogURI, useExclusionList, suiteType);
 }
 
 TestSuite *TestSuite::openCatalog(QIODevice *input,
                                   QString &errorMsg,
                                   const QUrl &fileName,
                                   const bool useExclusionList,
-                                  const bool isXSLTCatalog)
+                                  SuiteType suiteType)
 {
     Q_ASSERT(input);
 
@@ -183,10 +184,12 @@ TestSuite *TestSuite::openCatalog(QIODevice *input,
 
     HandlerPtr loader;
 
-    if(isXSLTCatalog)
-        loader = HandlerPtr(new XSLTTestSuiteHandler(fileName));
-    else
-        loader = HandlerPtr(new TestSuiteHandler(fileName, useExclusionList));
+    switch (suiteType) {
+        case XQuerySuite: loader = HandlerPtr(new TestSuiteHandler(fileName, useExclusionList)); break;
+        case XsltSuite: loader = HandlerPtr(new XSLTTestSuiteHandler(fileName)); break;
+        case XsdSuite: loader = HandlerPtr(new XSDTestSuiteHandler(fileName)); break;
+        default: Q_ASSERT(false); break;
+    }
 
     reader.setContentHandler(loader.data());
 
@@ -198,8 +201,13 @@ TestSuite *TestSuite::openCatalog(QIODevice *input,
         return 0;
     }
 
-    TestSuite *const suite = isXSLTCatalog ? static_cast<XSLTTestSuiteHandler *>(loader.data())->testSuite()
-                                           : static_cast<TestSuiteHandler *>(loader.data())->testSuite();
+    TestSuite *suite = 0;
+    switch (suiteType) {
+        case XQuerySuite: suite = static_cast<TestSuiteHandler *>(loader.data())->testSuite(); break;
+        case XsltSuite: suite = static_cast<XSLTTestSuiteHandler *>(loader.data())->testSuite(); break;
+        case XsdSuite: suite = static_cast<XSDTestSuiteHandler *>(loader.data())->testSuite(); break;
+        default: Q_ASSERT(false); break;
+    }
 
     if(suite)
         return suite;