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>

34 files changed, 66 insertions, 66 deletions

diff --git a/src/xmlpatterns/type/qabstractnodetest_p.h b/src/xmlpatterns/type/qabstractnodetest_p.h
index 4511d57..55c7f30 100644
--- a/src/xmlpatterns/type/qabstractnodetest_p.h
+++ b/src/xmlpatterns/type/qabstractnodetest_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AbstractNodeTest_H
 #define Patternist_AbstractNodeTest_H
 
-#include "qanynodetype_p.h"
+#include <private/qanynodetype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qanyitemtype_p.h b/src/xmlpatterns/type/qanyitemtype_p.h
index 3785a45..56e6bcb 100644
--- a/src/xmlpatterns/type/qanyitemtype_p.h
+++ b/src/xmlpatterns/type/qanyitemtype_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AnyItemType_H
 #define Patternist_AnyItemType_H
 
-#include "qatomictype_p.h"
+#include <private/qatomictype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qanynodetype_p.h b/src/xmlpatterns/type/qanynodetype_p.h
index bbf4bab..b6a36b0 100644
--- a/src/xmlpatterns/type/qanynodetype_p.h
+++ b/src/xmlpatterns/type/qanynodetype_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_AnyNodeType_H
 #define Patternist_AnyNodeType_H
 
-#include "qatomictype_p.h"
-#include "qitem_p.h"
+#include <private/qatomictype_p.h>
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qanysimpletype_p.h b/src/xmlpatterns/type/qanysimpletype_p.h
index 964bf12..a1f6725 100644
--- a/src/xmlpatterns/type/qanysimpletype_p.h
+++ b/src/xmlpatterns/type/qanysimpletype_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AnySimpleType_H
 #define Patternist_AnySimpleType_H
 
-#include "qanytype_p.h"
+#include <private/qanytype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qanytype_p.h b/src/xmlpatterns/type/qanytype_p.h
index 230cd65..26b26e7 100644
--- a/src/xmlpatterns/type/qanytype_p.h
+++ b/src/xmlpatterns/type/qanytype_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AnyType_H
 #define Patternist_AnyType_H
 
-#include "qschematype_p.h"
+#include <private/qschematype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qatomiccasterlocator_p.h b/src/xmlpatterns/type/qatomiccasterlocator_p.h
index 8c3207a..96de120 100644
--- a/src/xmlpatterns/type/qatomiccasterlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AtomicCasterLocator_H
 #define Patternist_AtomicCasterLocator_H
 
-#include "qatomictypedispatch_p.h"
+#include <private/qatomictypedispatch_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qatomiccasterlocators_p.h b/src/xmlpatterns/type/qatomiccasterlocators_p.h
index 76feac0..e4fee69 100644
--- a/src/xmlpatterns/type/qatomiccasterlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocators_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_AtomicCasterLocators_H
 #define Patternist_AtomicCasterLocators_H
 
-#include "qatomiccasterlocator_p.h"
-#include "qatomiccasters_p.h"
-//#include "qderivedinteger_p.h"
+#include <private/qatomiccasterlocator_p.h>
+#include <private/qatomiccasters_p.h>
+//#include <private/qderivedinteger_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
index 9e4a966..c5b1729 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AtomicComparatorLocator_H
 #define Patternist_AtomicComparatorLocator_H
 
-#include "qatomictypedispatch_p.h"
+#include <private/qatomictypedispatch_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
index 53fcca5..b5fb1b3 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AtomicComparatorLocators_H
 #define Patternist_AtomicComparatorLocators_H
 
-#include "qatomiccomparatorlocator_p.h"
+#include <private/qatomiccomparatorlocator_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
index 2f3150a..d2eee3c 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AtomicTypeVisitorResultLocator_H
 #define Patternist_AtomicTypeVisitorResultLocator_H
 
-#include "qatomictypedispatch_p.h"
+#include <private/qatomictypedispatch_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
index 7f76e83..5dfecea 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_AtomicMathematicianLocators_H
 #define Patternist_AtomicMathematicianLocators_H
 
-#include "qatomicmathematician_p.h"
-#include "qatomicmathematicianlocator_p.h"
+#include <private/qatomicmathematician_p.h>
+#include <private/qatomicmathematicianlocator_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/type/qatomictype_p.h b/src/xmlpatterns/type/qatomictype_p.h
index 02a48be..120487a 100644
--- a/src/xmlpatterns/type/qatomictype_p.h
+++ b/src/xmlpatterns/type/qatomictype_p.h
@@ -52,12 +52,12 @@
 #ifndef Patternist_AtomicType_H
 #define Patternist_AtomicType_H
 
-#include "qanysimpletype_p.h"
-#include "qatomiccasterlocator_p.h"
-#include "qatomiccomparatorlocator_p.h"
-#include "qatomicmathematicianlocator_p.h"
-#include "qatomictypedispatch_p.h"
-#include "qitemtype_p.h"
+#include <private/qanysimpletype_p.h>
+#include <private/qatomiccasterlocator_p.h>
+#include <private/qatomiccomparatorlocator_p.h>
+#include <private/qatomicmathematicianlocator_p.h>
+#include <private/qatomictypedispatch_p.h>
+#include <private/qitemtype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qbasictypesfactory_p.h b/src/xmlpatterns/type/qbasictypesfactory_p.h
index e0916a9..91ac94b 100644
--- a/src/xmlpatterns/type/qbasictypesfactory_p.h
+++ b/src/xmlpatterns/type/qbasictypesfactory_p.h
@@ -53,7 +53,7 @@
 #define Patternist_BuiltinTypesFactory_H
 
 #include <QHash>
-#include "qschematypefactory_p.h"
+#include <private/qschematypefactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qbuiltinatomictype_p.h b/src/xmlpatterns/type/qbuiltinatomictype_p.h
index 874cd6d..9a8e96b 100644
--- a/src/xmlpatterns/type/qbuiltinatomictype_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictype_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_BuiltinAtomicType_H
 #define Patternist_BuiltinAtomicType_H
 
-#include "qatomictype_p.h"
+#include <private/qatomictype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qbuiltinatomictypes_p.h b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
index d0e075c..6f9bc10 100644
--- a/src/xmlpatterns/type/qbuiltinatomictypes_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_BuiltinAtomicTypes_H
 #define Patternist_BuiltinAtomicTypes_H
 
-#include "qatomiccasterlocators_p.h"
-#include "qatomiccomparatorlocators_p.h"
-#include "qbuiltinatomictype_p.h"
+#include <private/qatomiccasterlocators_p.h>
+#include <private/qatomiccomparatorlocators_p.h>
+#include <private/qbuiltinatomictype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qbuiltinnodetype_p.h b/src/xmlpatterns/type/qbuiltinnodetype_p.h
index 7f6eb4d..8967ad0 100644
--- a/src/xmlpatterns/type/qbuiltinnodetype_p.h
+++ b/src/xmlpatterns/type/qbuiltinnodetype_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_BuiltinNodeType_H
 #define Patternist_BuiltinNodeType_H
 
-#include "qitem_p.h"
-#include "qanynodetype_p.h"
-#include "qbuiltintypes_p.h"
+#include <private/qitem_p.h>
+#include <private/qanynodetype_p.h>
+#include <private/qbuiltintypes_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qbuiltintypes_p.h b/src/xmlpatterns/type/qbuiltintypes_p.h
index b998c5b..44ccd86 100644
--- a/src/xmlpatterns/type/qbuiltintypes_p.h
+++ b/src/xmlpatterns/type/qbuiltintypes_p.h
@@ -52,13 +52,13 @@
 #ifndef Patternist_BuiltinTypes_H
 #define Patternist_BuiltinTypes_H
 
-#include "qanynodetype_p.h"
-#include "qanysimpletype_p.h"
-#include "qanytype_p.h"
-#include "qbuiltinatomictype_p.h"
-#include "qitemtype_p.h"
-#include "qnumerictype_p.h"
-#include "quntyped_p.h"
+#include <private/qanynodetype_p.h>
+#include <private/qanysimpletype_p.h>
+#include <private/qanytype_p.h>
+#include <private/qbuiltinatomictype_p.h>
+#include <private/qitemtype_p.h>
+#include <private/qnumerictype_p.h>
+#include <private/quntyped_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qcommonsequencetypes_p.h b/src/xmlpatterns/type/qcommonsequencetypes_p.h
index b39493b..fd405b4 100644
--- a/src/xmlpatterns/type/qcommonsequencetypes_p.h
+++ b/src/xmlpatterns/type/qcommonsequencetypes_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_CommonSequenceTypes_H
 #define Patternist_CommonSequenceTypes_H
 
-#include "qemptysequencetype_p.h"
-#include "qnonetype_p.h"
+#include <private/qemptysequencetype_p.h>
+#include <private/qnonetype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qebvtype_p.h b/src/xmlpatterns/type/qebvtype_p.h
index 13eaabc..50dfc8f 100644
--- a/src/xmlpatterns/type/qebvtype_p.h
+++ b/src/xmlpatterns/type/qebvtype_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_EBVType_H
 #define Patternist_EBVType_H
 
-#include "qatomictype_p.h"
-#include "qsequencetype_p.h"
+#include <private/qatomictype_p.h>
+#include <private/qsequencetype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qemptysequencetype_p.h b/src/xmlpatterns/type/qemptysequencetype_p.h
index a89f181..dabaa3e 100644
--- a/src/xmlpatterns/type/qemptysequencetype_p.h
+++ b/src/xmlpatterns/type/qemptysequencetype_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_EmptySequenceType_H
 #define Patternist_EmptySequenceType_H
 
-#include "qatomictype_p.h"
-#include "qsequencetype_p.h"
+#include <private/qatomictype_p.h>
+#include <private/qsequencetype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qgenericsequencetype_p.h b/src/xmlpatterns/type/qgenericsequencetype_p.h
index 996eb80..39cf78a 100644
--- a/src/xmlpatterns/type/qgenericsequencetype_p.h
+++ b/src/xmlpatterns/type/qgenericsequencetype_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_GenericSequenceType_H
 #define Patternist_GenericSequenceType_H
 
-#include "qcommonsequencetypes_p.h"
-#include "qsequencetype_p.h"
+#include <private/qcommonsequencetypes_p.h>
+#include <private/qsequencetype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qlocalnametest_p.h b/src/xmlpatterns/type/qlocalnametest_p.h
index 3f726ce..2519363 100644
--- a/src/xmlpatterns/type/qlocalnametest_p.h
+++ b/src/xmlpatterns/type/qlocalnametest_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_LocalNameTest_H
 #define Patternist_LocalNameTest_H
 
-#include "qabstractnodetest_p.h"
+#include <private/qabstractnodetest_p.h>
 
 template<typename Key, typename Value> class QHash;
 
diff --git a/src/xmlpatterns/type/qmultiitemtype_p.h b/src/xmlpatterns/type/qmultiitemtype_p.h
index 7a50044..06d9395 100644
--- a/src/xmlpatterns/type/qmultiitemtype_p.h
+++ b/src/xmlpatterns/type/qmultiitemtype_p.h
@@ -54,7 +54,7 @@
 
 #include <QList>
 
-#include "qitemtype_p.h"
+#include <private/qitemtype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qnamedschemacomponent_p.h b/src/xmlpatterns/type/qnamedschemacomponent_p.h
index 25a4a57..3c9cd5e 100644
--- a/src/xmlpatterns/type/qnamedschemacomponent_p.h
+++ b/src/xmlpatterns/type/qnamedschemacomponent_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_NamedSchemaComponent_H
 #define Patternist_NamedSchemaComponent_H
 
-#include "qnamepool_p.h"
-#include "qschemacomponent_p.h"
-#include "qxmlname.h"
+#include <private/qnamepool_p.h>
+#include <private/qschemacomponent_p.h>
+#include <QXmlName>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qnamespacenametest_p.h b/src/xmlpatterns/type/qnamespacenametest_p.h
index 5ce5213..2eb9280 100644
--- a/src/xmlpatterns/type/qnamespacenametest_p.h
+++ b/src/xmlpatterns/type/qnamespacenametest_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_NamespaceNameTest_H
 #define Patternist_NamespaceNameTest_H
 
-#include "qabstractnodetest_p.h"
+#include <private/qabstractnodetest_p.h>
 
 template<typename Key, typename Value> class QHash;
 
diff --git a/src/xmlpatterns/type/qnonetype_p.h b/src/xmlpatterns/type/qnonetype_p.h
index 922bdcb..9596b36 100644
--- a/src/xmlpatterns/type/qnonetype_p.h
+++ b/src/xmlpatterns/type/qnonetype_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_NoneType_H
 #define Patternist_NoneType_H
 
-#include "qatomictype_p.h"
-#include "qsequencetype_p.h"
+#include <private/qatomictype_p.h>
+#include <private/qsequencetype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qnumerictype_p.h b/src/xmlpatterns/type/qnumerictype_p.h
index 97ce9d4..5467aad 100644
--- a/src/xmlpatterns/type/qnumerictype_p.h
+++ b/src/xmlpatterns/type/qnumerictype_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_NumericType_H
 #define Patternist_NumericType_H
 
-#include "qatomictype_p.h"
+#include <private/qatomictype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qqnametest_p.h b/src/xmlpatterns/type/qqnametest_p.h
index fe5e383..63886d8 100644
--- a/src/xmlpatterns/type/qqnametest_p.h
+++ b/src/xmlpatterns/type/qqnametest_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_QNameTest_H
 #define Patternist_QNameTest_H
 
-#include "qabstractnodetest_p.h"
+#include <private/qabstractnodetest_p.h>
 
 template<typename Key, typename Value> class QHash;
 
diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h
index 87b2bc1..701262e 100644
--- a/src/xmlpatterns/type/qschematype_p.h
+++ b/src/xmlpatterns/type/qschematype_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_SchemaType_H
 #define Patternist_SchemaType_H
 
-#include "qnamepool_p.h"
-#include "qschemacomponent_p.h"
-#include "qxmlname.h"
+#include <private/qnamepool_p.h>
+#include <private/qschemacomponent_p.h>
+#include <QXmlName>
 
 template<typename N, typename M> class QHash;
 template<typename N> class QList;
diff --git a/src/xmlpatterns/type/qschematypefactory_p.h b/src/xmlpatterns/type/qschematypefactory_p.h
index 519ca1a..38a37f0 100644
--- a/src/xmlpatterns/type/qschematypefactory_p.h
+++ b/src/xmlpatterns/type/qschematypefactory_p.h
@@ -54,9 +54,9 @@
 
 #include <QSharedData>
 
-#include "qreportcontext_p.h"
-#include "qitemtype_p.h"
-#include "qschematype_p.h"
+#include <private/qreportcontext_p.h>
+#include <private/qitemtype_p.h>
+#include <private/qschematype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qsequencetype_p.h b/src/xmlpatterns/type/qsequencetype_p.h
index a075a86..2483510 100644
--- a/src/xmlpatterns/type/qsequencetype_p.h
+++ b/src/xmlpatterns/type/qsequencetype_p.h
@@ -56,8 +56,8 @@ template<typename T> class QList;
 
 #include <QSharedData>
 
-#include "qcardinality_p.h"
-#include "qitemtype_p.h"
+#include <private/qcardinality_p.h>
+#include <private/qitemtype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qtypechecker_p.h b/src/xmlpatterns/type/qtypechecker_p.h
index 23079bb..ff56631 100644
--- a/src/xmlpatterns/type/qtypechecker_p.h
+++ b/src/xmlpatterns/type/qtypechecker_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_TypeChecker_H
 #define Patternist_TypeChecker_H
 
-#include "qstaticcontext_p.h"
-#include "qexpression_p.h"
+#include <private/qstaticcontext_p.h>
+#include <private/qexpression_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/quntyped_p.h b/src/xmlpatterns/type/quntyped_p.h
index 0ac5c00..3023791 100644
--- a/src/xmlpatterns/type/quntyped_p.h
+++ b/src/xmlpatterns/type/quntyped_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Untyped_H
 #define Patternist_Untyped_H
 
-#include "qanytype_p.h"
+#include <private/qanytype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/type/qxsltnodetest_p.h b/src/xmlpatterns/type/qxsltnodetest_p.h
index 875c97d..6f5277a 100644
--- a/src/xmlpatterns/type/qxsltnodetest_p.h
+++ b/src/xmlpatterns/type/qxsltnodetest_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XSLTNodeTest_H
 #define Patternist_XSLTNodeTest_H
 
-#include "qanynodetype_p.h"
+#include <private/qanynodetype_p.h>
 
 QT_BEGIN_HEADER