Make private headers usable, and use them in the tests.

The xmlpatterns private headers were not including each other correctly,
making them unusable unless the source directory was available and in
INCLUDEPATH.

Fix it so that the private headers include each other by <private/...>,
allowing them to work for an installed Qt.

Change-Id: I9c7cbad219ed141c356d9ea097e67e0fb2fa550c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

16 files changed, 39 insertions, 39 deletions

diff --git a/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
index 6562f70..5d91df4 100644
--- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h
+++ b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_CurrentItemContext_H
 #define Patternist_CurrentItemContext_H
 
-#include "qdelegatingdynamiccontext_p.h"
+#include <private/qdelegatingdynamiccontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
index f668c91..00bd6c0 100644
--- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_DelegatingDynamicContext_H
 #define Patternist_DelegatingDynamicContext_H
 
-#include "qdynamiccontext_p.h"
-#include "qexpression_p.h"
+#include <private/qdynamiccontext_p.h>
+#include <private/qexpression_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
index 35f3e12..ce303d0 100644
--- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
@@ -54,9 +54,9 @@
 
 #include <QUrl>
 
-#include "qstaticcontext_p.h"
-#include "qfunctionfactory_p.h"
-#include "qschematypefactory_p.h"
+#include <private/qstaticcontext_p.h>
+#include <private/qfunctionfactory_p.h>
+#include <private/qschematypefactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h
index 155f6aa..20d2707 100644
--- a/src/xmlpatterns/environment/qdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdynamiccontext_p.h
@@ -52,15 +52,15 @@
 #ifndef Patternist_DynamicContext_H
 #define Patternist_DynamicContext_H
 
-#include "qautoptr_p.h"
-#include "qcachecells_p.h"
-#include "qexternalvariableloader_p.h"
-#include "qitem_p.h"
-#include "qnamepool_p.h"
-#include "qnodebuilder_p.h"
-#include "qprimitives_p.h"
-#include "qreportcontext_p.h"
-#include "qresourceloader_p.h"
+#include <private/qautoptr_p.h>
+#include <private/qcachecells_p.h>
+#include <private/qexternalvariableloader_p.h>
+#include <private/qitem_p.h>
+#include <private/qnamepool_p.h>
+#include <private/qnodebuilder_p.h>
+#include <private/qprimitives_p.h>
+#include <private/qreportcontext_p.h>
+#include <private/qresourceloader_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h
index 2f3196d..b9963e6 100644
--- a/src/xmlpatterns/environment/qfocus_p.h
+++ b/src/xmlpatterns/environment/qfocus_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Focus_H
 #define Patternist_Focus_H
 
-#include "qdelegatingdynamiccontext_p.h"
+#include <private/qdelegatingdynamiccontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
index d1e8dff..4d0145c 100644
--- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
@@ -55,9 +55,9 @@
 #include <QDateTime>
 #include <QVector>
 
-#include "qdaytimeduration_p.h"
-#include "qstackcontextbase_p.h"
-#include "qexpression_p.h"
+#include <private/qdaytimeduration_p.h>
+#include <private/qstackcontextbase_p.h>
+#include <private/qexpression_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
index 311880f..af0ab6f 100644
--- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
@@ -55,9 +55,9 @@
 #include <QUrl>
 #include <QXmlQuery>
 
-#include "qstaticcontext_p.h"
-#include "qfunctionfactory_p.h"
-#include "qschematypefactory_p.h"
+#include <private/qstaticcontext_p.h>
+#include <private/qfunctionfactory_p.h>
+#include <private/qschematypefactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
index 8c9fd48..51aa6f1 100644
--- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_ReceiverDynamicContext_H
 #define Patternist_ReceiverDynamicContext_H
 
-#include "qdelegatingdynamiccontext_p.h"
+#include <private/qdelegatingdynamiccontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qreportcontext_p.h b/src/xmlpatterns/environment/qreportcontext_p.h
index e2871fa..ecae020 100644
--- a/src/xmlpatterns/environment/qreportcontext_p.h
+++ b/src/xmlpatterns/environment/qreportcontext_p.h
@@ -56,8 +56,8 @@
 #include <QAbstractUriResolver>
 #include <QSourceLocation>
 
-#include "qnamepool_p.h"
-#include "qxmlname.h"
+#include <private/qnamepool_p.h>
+#include <QXmlName>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h
index 8604373..414c9b8 100644
--- a/src/xmlpatterns/environment/qstackcontextbase_p.h
+++ b/src/xmlpatterns/environment/qstackcontextbase_p.h
@@ -54,9 +54,9 @@
 
 #include <QVector>
 
-#include "qdaytimeduration_p.h"
-#include "qdelegatingdynamiccontext_p.h"
-#include "qexpression_p.h"
+#include <private/qdaytimeduration_p.h>
+#include <private/qdelegatingdynamiccontext_p.h>
+#include <private/qexpression_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
index dc2a89c..20111e2 100644
--- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
+++ b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_StaticBaseURIContext_H
 #define Patternist_StaticBaseURIContext_H
 
-#include "qdelegatingstaticcontext_p.h"
+#include <private/qdelegatingstaticcontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
index f9515c7..0f9ef4b 100644
--- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_StaticCompatibilityContext_H
 #define Patternist_StaticCompatibilityContext_H
 
-#include "qdelegatingstaticcontext_p.h"
+#include <private/qdelegatingstaticcontext_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h
index c3b20c0..0a8e43e 100644
--- a/src/xmlpatterns/environment/qstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcontext_p.h
@@ -52,12 +52,12 @@
 #ifndef Patternist_StaticContext_H
 #define Patternist_StaticContext_H
 
-#include "qexternalvariableloader_p.h"
-#include "qitemtype_p.h"
-#include "qnamepool_p.h"
-#include "qnamespaceresolver_p.h"
-#include "qreportcontext_p.h"
-#include "qresourceloader_p.h"
+#include <private/qexternalvariableloader_p.h>
+#include <private/qitemtype_p.h>
+#include <private/qnamepool_p.h>
+#include <private/qnamespaceresolver_p.h>
+#include <private/qreportcontext_p.h>
+#include <private/qresourceloader_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
index 6a60e87..89d6f4f 100644
--- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_StaticCurrentContext_H
 #define Patternist_StaticCurrentContext_H
 
-#include "qdelegatingstaticcontext_p.h"
+#include <private/qdelegatingstaticcontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
index 0f92c37..4c5ee4f 100644
--- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h
+++ b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_StaticFocusContext_H
 #define Patternist_StaticFocusContext_H
 
-#include "qdelegatingstaticcontext_p.h"
+#include <private/qdelegatingstaticcontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
index 771421b..e046154 100644
--- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
+++ b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_StaticNamespaceContext_H
 #define Patternist_StaticNamespaceContext_H
 
-#include "qdelegatingstaticcontext_p.h"
+#include <private/qdelegatingstaticcontext_p.h>
 
 QT_BEGIN_HEADER