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>

11 files changed, 45 insertions, 45 deletions

diff --git a/src/xmlpatterns/api/qcoloringmessagehandler_p.h b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
index de97fbb..58d89c6 100644
--- a/src/xmlpatterns/api/qcoloringmessagehandler_p.h
+++ b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
@@ -54,8 +54,8 @@
 
 #include <QHash>
 
-#include "qcoloroutput_p.h"
-#include "qabstractmessagehandler.h"
+#include <private/qcoloroutput_p.h>
+#include <QAbstractMessageHandler>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/api/qdeviceresourceloader_p.h b/src/xmlpatterns/api/qdeviceresourceloader_p.h
index a875c22..2347e71 100644
--- a/src/xmlpatterns/api/qdeviceresourceloader_p.h
+++ b/src/xmlpatterns/api/qdeviceresourceloader_p.h
@@ -55,7 +55,7 @@
 template<typename T> class QSet;
 class QUrl;
 
-#include "qresourceloader_p.h"
+#include <private/qresourceloader_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/api/qpullbridge_p.h b/src/xmlpatterns/api/qpullbridge_p.h
index a4d6785..953d5f1 100644
--- a/src/xmlpatterns/api/qpullbridge_p.h
+++ b/src/xmlpatterns/api/qpullbridge_p.h
@@ -55,9 +55,9 @@
 #include <QtCore/QPair>
 #include <QtCore/QStack>
 
-#include "qabstractxmlforwarditerator_p.h"
-#include "qabstractxmlpullprovider_p.h"
-#include "qitem_p.h"
+#include <private/qabstractxmlforwarditerator_p.h>
+#include <private/qabstractxmlpullprovider_p.h>
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/api/qresourcedelegator_p.h b/src/xmlpatterns/api/qresourcedelegator_p.h
index 08d07c4..f7443c6 100644
--- a/src/xmlpatterns/api/qresourcedelegator_p.h
+++ b/src/xmlpatterns/api/qresourcedelegator_p.h
@@ -55,7 +55,7 @@
 #include <QSet>
 #include <QUrl>
 
-#include "qdeviceresourceloader_p.h"
+#include <private/qdeviceresourceloader_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/api/quriloader_p.h b/src/xmlpatterns/api/quriloader_p.h
index b80966e..6643bcd 100644
--- a/src/xmlpatterns/api/quriloader_p.h
+++ b/src/xmlpatterns/api/quriloader_p.h
@@ -55,8 +55,8 @@
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtXmlPatterns/QXmlName>
 
-#include "qnamepool_p.h"
-#include "qvariableloader_p.h"
+#include <private/qnamepool_p.h>
+#include <private/qvariableloader_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/xmlpatterns/api/qvariableloader_p.h b/src/xmlpatterns/api/qvariableloader_p.h
index 2e581fa..ceba9b2 100644
--- a/src/xmlpatterns/api/qvariableloader_p.h
+++ b/src/xmlpatterns/api/qvariableloader_p.h
@@ -56,8 +56,8 @@
 #include <QtXmlPatterns/QXmlQuery>
 #include <QtDebug>
 
-#include "qdynamiccontext_p.h"
-#include "qexternalvariableloader_p.h"
+#include <private/qdynamiccontext_p.h>
+#include <private/qexternalvariableloader_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/api/qxmlquery_p.h b/src/xmlpatterns/api/qxmlquery_p.h
index e980501..127751f 100644
--- a/src/xmlpatterns/api/qxmlquery_p.h
+++ b/src/xmlpatterns/api/qxmlquery_p.h
@@ -62,22 +62,22 @@
 #include <QXmlNamePool>
 #include <QXmlQuery>
 
-#include "qacceltreebuilder_p.h"
-#include "qacceltreeresourceloader_p.h"
-#include "qcoloringmessagehandler_p.h"
-#include "qcommonsequencetypes_p.h"
-#include "qexpressionfactory_p.h"
-#include "qfocus_p.h"
-#include "qfunctionfactorycollection_p.h"
-#include "qgenericdynamiccontext_p.h"
-#include "qgenericstaticcontext_p.h"
-#include "qnamepool_p.h"
-#include "qnetworkaccessdelegator_p.h"
-#include "qreferencecountedvalue_p.h"
-#include "qresourcedelegator_p.h"
-#include "qstaticfocuscontext_p.h"
-#include "quriloader_p.h"
-#include "qvariableloader_p.h"
+#include <private/qacceltreebuilder_p.h>
+#include <private/qacceltreeresourceloader_p.h>
+#include <private/qcoloringmessagehandler_p.h>
+#include <private/qcommonsequencetypes_p.h>
+#include <private/qexpressionfactory_p.h>
+#include <private/qfocus_p.h>
+#include <private/qfunctionfactorycollection_p.h>
+#include <private/qgenericdynamiccontext_p.h>
+#include <private/qgenericstaticcontext_p.h>
+#include <private/qnamepool_p.h>
+#include <private/qnetworkaccessdelegator_p.h>
+#include <private/qreferencecountedvalue_p.h>
+#include <private/qresourcedelegator_p.h>
+#include <private/qstaticfocuscontext_p.h>
+#include <private/quriloader_p.h>
+#include <private/qvariableloader_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/xmlpatterns/api/qxmlresultitems_p.h b/src/xmlpatterns/api/qxmlresultitems_p.h
index d1d6962..ec1e879 100644
--- a/src/xmlpatterns/api/qxmlresultitems_p.h
+++ b/src/xmlpatterns/api/qxmlresultitems_p.h
@@ -52,9 +52,9 @@
 #ifndef QXMLRESULTITEMS_P_H
 #define QXMLRESULTITEMS_P_H
 
-#include "qcommonvalues_p.h"
-#include "qdynamiccontext_p.h"
-#include "qitem_p.h"
+#include <private/qcommonvalues_p.h>
+#include <private/qdynamiccontext_p.h>
+#include <private/qitem_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/xmlpatterns/api/qxmlschema_p.h b/src/xmlpatterns/api/qxmlschema_p.h
index 94887ad..ffe5820 100644
--- a/src/xmlpatterns/api/qxmlschema_p.h
+++ b/src/xmlpatterns/api/qxmlschema_p.h
@@ -52,15 +52,15 @@
 #ifndef QXMLSCHEMA_P_H
 #define QXMLSCHEMA_P_H
 
-#include "qabstractmessagehandler.h"
-#include "qabstracturiresolver.h"
-#include "qautoptr_p.h"
-#include "qcoloringmessagehandler_p.h"
-#include "qreferencecountedvalue_p.h"
+#include <QAbstractMessageHandler>
+#include <QAbstractUriResolver>
+#include <private/qautoptr_p.h>
+#include <private/qcoloringmessagehandler_p.h>
+#include <private/qreferencecountedvalue_p.h>
 
-#include "qxsdschemacontext_p.h"
-#include "qxsdschemaparser_p.h"
-#include "qxsdschemaparsercontext_p.h"
+#include <private/qxsdschemacontext_p.h>
+#include <private/qxsdschemaparser_p.h>
+#include <private/qxsdschemaparsercontext_p.h>
 
 #include <QtCore/QSharedData>
 #include <QtNetwork/QNetworkAccessManager>
diff --git a/src/xmlpatterns/api/qxmlschemavalidator_p.h b/src/xmlpatterns/api/qxmlschemavalidator_p.h
index 4b545f9..62077c3 100644
--- a/src/xmlpatterns/api/qxmlschemavalidator_p.h
+++ b/src/xmlpatterns/api/qxmlschemavalidator_p.h
@@ -54,13 +54,13 @@
 
 #include "qabstractmessagehandler.h"
 #include "qabstracturiresolver.h"
-#include "qautoptr_p.h"
-#include "qcoloringmessagehandler_p.h"
+#include <private/qautoptr_p.h>
+#include <private/qcoloringmessagehandler_p.h>
 #include "qxmlschema.h"
-#include "qxmlschema_p.h"
+#include <private/qxmlschema_p.h>
 
-#include "qxsdschemacontext_p.h"
-#include "qxsdschema_p.h"
+#include <private/qxsdschemacontext_p.h>
+#include <private/qxsdschema_p.h>
 
 #include <QtNetwork/QNetworkAccessManager>
 
diff --git a/src/xmlpatterns/api/qxmlserializer_p.h b/src/xmlpatterns/api/qxmlserializer_p.h
index 802a2f0..93bc013 100644
--- a/src/xmlpatterns/api/qxmlserializer_p.h
+++ b/src/xmlpatterns/api/qxmlserializer_p.h
@@ -59,8 +59,8 @@
 #include <QtXmlPatterns/QXmlNamePool>
 #include <QtXmlPatterns/QXmlSerializer>
 
-#include "qnamepool_p.h"
-#include "qabstractxmlreceiver_p.h"
+#include <private/qnamepool_p.h>
+#include <private/qabstractxmlreceiver_p.h>
 
 QT_BEGIN_HEADER