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, 90 insertions, 0 deletions

diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h b/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h
new file mode 100644
index 0000000..8c57e82
--- /dev/null
+++ b/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Patternist project on Trolltech Labs.
+**
+** $TROLLTECH_GPL_LICENSE$
+**
+***************************************************************************
+*/
+
+#ifndef PatternistSDK_XSDTestSuiteHandler_H
+#define PatternistSDK_XSDTestSuiteHandler_H
+
+#include <QUrl>
+#include <QXmlDefaultHandler>
+
+#include "ExternalSourceLoader.h"
+#include "TestSuite.h"
+#include "XQTSTestCase.h"
+
+QT_BEGIN_HEADER
+
+namespace QPatternistSDK
+{
+    class TestBaseLine;
+    class TestGroup;
+    class XSDTSTestCase;
+
+    /**
+     * @short Creates a TestSuite from the XSD Test Suite.
+     *
+     * The created TestSuite can be retrieved via testSuite().
+     *
+     * @note XSDTestSuiteHandler assumes the XML is valid by having been validated
+     * against the W3C XML Schema. It has no safety checks for that the XML format
+     * is correct but is hard coded for it. Thus, the behavior is undefined if
+     * the XML is invalid.
+     *
+     * @ingroup PatternistSDK
+     * @author Tobias Koenig <tobias.koenig@trolltech.com>
+     */
+    class Q_PATTERNISTSDK_EXPORT XSDTestSuiteHandler : public QXmlDefaultHandler
+    {
+    public:
+        /**
+         * @param catalogFile the URI for the catalog file being parsed. This
+         * URI is used for creating absolute URIs for files mentioned in
+         * the catalog with relative URIs.
+         * @param useExclusionList whether excludeTestGroups.txt should be used to ignore
+         * test groups when loading
+         */
+        XSDTestSuiteHandler(const QUrl &catalogFile);
+        virtual bool characters(const QString &ch);
+
+        virtual bool endElement(const QString &namespaceURI,
+                                const QString &localName,
+                                const QString &qName);
+        virtual bool startElement(const QString &namespaceURI,
+                                  const QString &localName,
+                                  const QString &qName,
+                                  const QXmlAttributes &atts);
+
+        virtual TestSuite *testSuite() const;
+
+    private:
+        TestSuite* m_ts;
+        const QUrl m_catalogFile;
+
+        TestGroup* m_topLevelGroup;
+        TestGroup* m_currentTestSet;
+        TestGroup* m_currentTestGroup;
+        XSDTSTestCase* m_currentTestCase;
+        bool m_inSchemaTest;
+        bool m_inInstanceTest;
+        bool m_inTestGroup;
+        bool m_inDescription;
+        bool m_schemaBlacklisted;
+        QString m_documentation;
+        QString m_currentSchemaLink;
+        int m_counter;
+        QSet<QString> m_blackList;
+    };
+}
+
+QT_END_HEADER
+
+#endif
+// vim: et:ts=4:sw=4:sts=4