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>

15 files changed, 32 insertions, 32 deletions

diff --git a/src/xmlpatterns/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h
index db606df..1f9d779 100644
--- a/src/xmlpatterns/iterators/qcachingiterator_p.h
+++ b/src/xmlpatterns/iterators/qcachingiterator_p.h
@@ -55,8 +55,8 @@
 #include <QList>
 #include <QVector>
 
-#include "qdynamiccontext_p.h"
-#include "qitem_p.h"
+#include <private/qdynamiccontext_p.h>
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
index 7d1a5eb..28356fe 100644
--- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
+++ b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
@@ -54,11 +54,11 @@
 
 #include <QList>
 
-#include "qexpression_p.h"
-#include "qitem_p.h"
-#include "qatomiccomparator_p.h"
-#include "qcomparisonplatform_p.h"
-#include "qsourcelocationreflection_p.h"
+#include <private/qexpression_p.h>
+#include <private/qitem_p.h>
+#include <private/qatomiccomparator_p.h>
+#include <private/qcomparisonplatform_p.h>
+#include <private/qsourcelocationreflection_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h
index 7f39d94..cc6eaed 100644
--- a/src/xmlpatterns/iterators/qdistinctiterator_p.h
+++ b/src/xmlpatterns/iterators/qdistinctiterator_p.h
@@ -54,11 +54,11 @@
 
 #include <QList>
 
-#include "qexpression_p.h"
-#include "qitem_p.h"
-#include "qatomiccomparator_p.h"
-#include "qcomparisonplatform_p.h"
-#include "qsourcelocationreflection_p.h"
+#include <private/qexpression_p.h>
+#include <private/qitem_p.h>
+#include <private/qatomiccomparator_p.h>
+#include <private/qcomparisonplatform_p.h>
+#include <private/qsourcelocationreflection_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h
index a759ec3..03ea324 100644
--- a/src/xmlpatterns/iterators/qemptyiterator_p.h
+++ b/src/xmlpatterns/iterators/qemptyiterator_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_EmptyIterator_H
 #define Patternist_EmptyIterator_H
 
-#include "qabstractxmlforwarditerator_p.h"
-#include "qprimitives_p.h"
+#include <private/qabstractxmlforwarditerator_p.h>
+#include <private/qprimitives_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qexceptiterator_p.h b/src/xmlpatterns/iterators/qexceptiterator_p.h
index cbd8221..d6c2d1c 100644
--- a/src/xmlpatterns/iterators/qexceptiterator_p.h
+++ b/src/xmlpatterns/iterators/qexceptiterator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_ExceptIterator_H
 #define Patternist_ExceptIterator_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h
index 37eb672..3e4c054 100644
--- a/src/xmlpatterns/iterators/qindexofiterator_p.h
+++ b/src/xmlpatterns/iterators/qindexofiterator_p.h
@@ -52,11 +52,11 @@
 #ifndef Patternist_IndexOfIterator_H
 #define Patternist_IndexOfIterator_H
 
-#include "qitem_p.h"
-#include "qatomiccomparator_p.h"
-#include "qcomparisonplatform_p.h"
-#include "qdynamiccontext_p.h"
-#include "qexpression_p.h"
+#include <private/qitem_p.h>
+#include <private/qatomiccomparator_p.h>
+#include <private/qcomparisonplatform_p.h>
+#include <private/qdynamiccontext_p.h>
+#include <private/qexpression_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h
index 6c1c702..98197ff 100644
--- a/src/xmlpatterns/iterators/qinsertioniterator_p.h
+++ b/src/xmlpatterns/iterators/qinsertioniterator_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_InsertionIterator_H
 #define Patternist_InsertionIterator_H
 
-#include "qabstractxmlforwarditerator_p.h"
-#include "qitem_p.h"
+#include <private/qabstractxmlforwarditerator_p.h>
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qintersectiterator_p.h b/src/xmlpatterns/iterators/qintersectiterator_p.h
index 9e7e834..526b4a9 100644
--- a/src/xmlpatterns/iterators/qintersectiterator_p.h
+++ b/src/xmlpatterns/iterators/qintersectiterator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_IntersectIterator_H
 #define Patternist_IntersectIterator_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
index 1798bd7..8f9169f 100644
--- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_ItemMappingIterator_H
 #define Patternist_ItemMappingIterator_H
 
-#include "qabstractxmlforwarditerator_p.h"
-#include "qdynamiccontext_p.h"
+#include <private/qabstractxmlforwarditerator_p.h>
+#include <private/qdynamiccontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h
index f449108..e325226 100644
--- a/src/xmlpatterns/iterators/qrangeiterator_p.h
+++ b/src/xmlpatterns/iterators/qrangeiterator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_RangeIterator_H
 #define Patternist_RangeIterator_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h
index a40c758..c45f280 100644
--- a/src/xmlpatterns/iterators/qremovaliterator_p.h
+++ b/src/xmlpatterns/iterators/qremovaliterator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_RemovalIterator_H
 #define Patternist_RemovalIterator_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
index e12a0aa..00ba5bf 100644
--- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_SequenceMappingIterator_H
 #define Patternist_SequenceMappingIterator_H
 
-#include "qabstractxmlforwarditerator_p.h"
-#include "qdynamiccontext_p.h"
+#include <private/qabstractxmlforwarditerator_p.h>
+#include <private/qdynamiccontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
index 5fff0b6..6b28fb3 100644
--- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
+++ b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_SubsequenceIterator_H
 #define Patternist_SubsequenceIterator_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
index 4810cff..16e22de 100644
--- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
+++ b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_ToCodepointsIterator_H
 #define Patternist_ToCodepointsIterator_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/iterators/qunioniterator_p.h b/src/xmlpatterns/iterators/qunioniterator_p.h
index 9b85fc3..2f7caff 100644
--- a/src/xmlpatterns/iterators/qunioniterator_p.h
+++ b/src/xmlpatterns/iterators/qunioniterator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_UnionIterator_H
 #define Patternist_UnionIterator_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER