Merge commit 'qt/master' into graphicseffects

Conflicts:
	src/gui/graphicsview/graphicsview.pri
	src/gui/graphicsview/qgraphicsitem_p.h
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/graphicsview/qgraphicsscene.h
	src/gui/graphicsview/qgraphicsview.cpp

1 files changed, 9 insertions, 2 deletions

diff --git a/src/xmlpatterns/api/qxmlquery.h b/src/xmlpatterns/api/qxmlquery.h
index 4ddfc76..b4ac121 100644
--- a/src/xmlpatterns/api/qxmlquery.h
+++ b/src/xmlpatterns/api/qxmlquery.h
@@ -71,6 +71,8 @@ namespace QPatternistSDK
 
 namespace QPatternist
 {
+    class XsdSchemaParser;
+    class XsdValidatingInstanceReader;
     class VariableLoader;
 };
 
@@ -79,8 +81,11 @@ class Q_XMLPATTERNS_EXPORT QXmlQuery
 public:
     enum QueryLanguage
     {
-        XQuery10    = 1,
-        XSLT20      = 2
+        XQuery10                                = 1,
+        XSLT20                                  = 2,
+        XmlSchema11IdentityConstraintSelector   = 1024,
+        XmlSchema11IdentityConstraintField      = 2048,
+        XPath20                                 = 4096
     };
 
     QXmlQuery();
@@ -136,6 +141,8 @@ private:
     friend class QXmlName;
     friend class QXmlSerializer;
     friend class QPatternistSDK::TestCase;
+    friend class QPatternist::XsdSchemaParser;
+    friend class QPatternist::XsdValidatingInstanceReader;
     friend class QPatternist::VariableLoader;
     template<typename TInputType> friend bool setFocusHelper(QXmlQuery *const queryInstance,
                                                              const TInputType &focusValue);