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>

20 files changed, 93 insertions, 109 deletions

diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri
index 631ed7f..1d978f3 100644
--- a/tests/auto/xmlpatterns.pri
+++ b/tests/auto/xmlpatterns.pri
@@ -16,19 +16,3 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
     else:win32: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}d
     else:       XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}_debug
 }
-
-XMLPATTERNS_SOURCES = $$QT.xmlpatterns.sources
-INCLUDEPATH += \
-               $$XMLPATTERNS_SOURCES/acceltree \
-               $$XMLPATTERNS_SOURCES/api \
-               $$XMLPATTERNS_SOURCES/data \
-               $$XMLPATTERNS_SOURCES/environment \
-               $$XMLPATTERNS_SOURCES/expr \
-               $$XMLPATTERNS_SOURCES/functions \
-               $$XMLPATTERNS_SOURCES/iterators \
-               $$XMLPATTERNS_SOURCES/janitors \
-               $$XMLPATTERNS_SOURCES/parser \
-               $$XMLPATTERNS_SOURCES/projection \
-               $$XMLPATTERNS_SOURCES/schema \
-               $$XMLPATTERNS_SOURCES/type \
-               $$XMLPATTERNS_SOURCES/utils
diff --git a/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp b/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
index fd7f1ae..0b6f477 100644
--- a/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
+++ b/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
@@ -41,8 +41,8 @@
 
 #include <QtTest/QtTest>
 
-#include "qxsdstatemachine_p.h"
-#include "qxsdschematoken_p.h"
+#include <private/qxsdstatemachine_p.h>
+#include <private/qxsdschematoken_p.h>
 
 using namespace QPatternist;
 
diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
index 8ceafee..f50c4d6 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
@@ -44,7 +44,7 @@
 #include <QtDebug>
 #include <QXmlNamePool>
 
-#include "qfunctionfactorycollection_p.h"
+#include <private/qfunctionfactorycollection_p.h>
 
 #include "ASTItem.h"
 #include "ExpressionInfo.h"
diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
index dd098e6..57db1bb 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
@@ -43,8 +43,8 @@
 #define PatternistSDK_DebugExpressionFactory_H
 
 #include "Global.h"
-#include "qexpressionfactory_p.h"
-#include "qfunctionfactory_p.h"
+#include <private/qexpressionfactory_p.h>
+#include <private/qfunctionfactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/tests/auto/xmlpatternssdk/ErrorItem.cpp b/tests/auto/xmlpatternssdk/ErrorItem.cpp
index 436edb9..06040a3 100644
--- a/tests/auto/xmlpatternssdk/ErrorItem.cpp
+++ b/tests/auto/xmlpatternssdk/ErrorItem.cpp
@@ -43,8 +43,8 @@
 #include <QPointer>
 #include <QVariant>
 
-#include "qreportcontext_p.h"
-#include "qcommonnamespaces_p.h"
+#include <private/qreportcontext_p.h>
+#include <private/qcommonnamespaces_p.h>
 
 #include "ErrorItem.h"
 
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h
index 9627300..c3a563e 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.h
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h
@@ -43,7 +43,7 @@
 #define PatternistSDK_ExpressionInfo_H
 
 #include "Global.h"
-#include "qexpressiondispatch_p.h"
+#include <private/qexpressiondispatch_p.h>
 
 #include <QPair>
 #include <QString>
diff --git a/tests/auto/xmlpatternssdk/ExpressionNamer.cpp b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
index 5470039..777f64f 100644
--- a/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
+++ b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
@@ -41,70 +41,70 @@
 
 #include <QtDebug>
 
-#include "qabstractfloat_p.h"
-#include "qandexpression_p.h"
-#include "qanyuri_p.h"
-#include "qapplytemplate_p.h"
-#include "qargumentreference_p.h"
-#include "qarithmeticexpression_p.h"
-#include "qatomicstring_p.h"
-#include "qatomizer_p.h"
-#include "qattributeconstructor_p.h"
-#include "qattributenamevalidator_p.h"
-#include "qaxisstep_p.h"
-#include "qbase64binary_p.h"
-#include "qboolean_p.h"
-#include "qcardinalityverifier_p.h"
-#include "qcastableas_p.h"
-#include "qcastas_p.h"
-#include "qcombinenodes_p.h"
-#include "qcontextitem_p.h"
-#include "qdate_p.h"
-#include "qdecimal_p.h"
-#include "qdynamiccontextstore_p.h"
-#include "qelementconstructor_p.h"
-#include "qemptysequence_p.h"
-#include "qevaluationcache_p.h"
-#include "qexpressionsequence_p.h"
-#include "qexpressionvariablereference_p.h"
-#include "qfirstitempredicate_p.h"
-#include "qforclause_p.h"
-#include "qfunctioncall_p.h"
-#include "qgday_p.h"
-#include "qgeneralcomparison_p.h"
-#include "qgenericpredicate_p.h"
-#include "qgmonthday_p.h"
-#include "qgmonth_p.h"
-#include "qgyearmonth_p.h"
-#include "qgyear_p.h"
-#include "qhexbinary_p.h"
-#include "qifthenclause_p.h"
-#include "qinstanceof_p.h"
-#include "qinteger_p.h"
-#include "qitem_p.h"
-#include "qitemverifier_p.h"
-#include "qliteral_p.h"
-#include "qnamespaceconstructor_p.h"
-#include "qncnameconstructor_p.h"
-#include "qnodecomparison_p.h"
-#include "qorexpression_p.h"
-#include "qpath_p.h"
-#include "qpositionalvariablereference_p.h"
-#include "qqnameconstructor_p.h"
-#include "qqnamevalue_p.h"
-#include "qquantifiedexpression_p.h"
-#include "qrangeexpression_p.h"
-#include "qrangevariablereference_p.h"
-#include "qschemadatetime_p.h"
-#include "qschematime_p.h"
-#include "qsimplecontentconstructor_p.h"
-#include "qtreatas_p.h"
-#include "qtruthpredicate_p.h"
-#include "quntypedatomicconverter_p.h"
-#include "quntypedatomic_p.h"
-#include "quserfunctioncallsite_p.h"
-#include "qvalidationerror_p.h"
-#include "qvaluecomparison_p.h"
+#include <private/qabstractfloat_p.h>
+#include <private/qandexpression_p.h>
+#include <private/qanyuri_p.h>
+#include <private/qapplytemplate_p.h>
+#include <private/qargumentreference_p.h>
+#include <private/qarithmeticexpression_p.h>
+#include <private/qatomicstring_p.h>
+#include <private/qatomizer_p.h>
+#include <private/qattributeconstructor_p.h>
+#include <private/qattributenamevalidator_p.h>
+#include <private/qaxisstep_p.h>
+#include <private/qbase64binary_p.h>
+#include <private/qboolean_p.h>
+#include <private/qcardinalityverifier_p.h>
+#include <private/qcastableas_p.h>
+#include <private/qcastas_p.h>
+#include <private/qcombinenodes_p.h>
+#include <private/qcontextitem_p.h>
+#include <private/qdate_p.h>
+#include <private/qdecimal_p.h>
+#include <private/qdynamiccontextstore_p.h>
+#include <private/qelementconstructor_p.h>
+#include <private/qemptysequence_p.h>
+#include <private/qevaluationcache_p.h>
+#include <private/qexpressionsequence_p.h>
+#include <private/qexpressionvariablereference_p.h>
+#include <private/qfirstitempredicate_p.h>
+#include <private/qforclause_p.h>
+#include <private/qfunctioncall_p.h>
+#include <private/qgday_p.h>
+#include <private/qgeneralcomparison_p.h>
+#include <private/qgenericpredicate_p.h>
+#include <private/qgmonthday_p.h>
+#include <private/qgmonth_p.h>
+#include <private/qgyearmonth_p.h>
+#include <private/qgyear_p.h>
+#include <private/qhexbinary_p.h>
+#include <private/qifthenclause_p.h>
+#include <private/qinstanceof_p.h>
+#include <private/qinteger_p.h>
+#include <private/qitem_p.h>
+#include <private/qitemverifier_p.h>
+#include <private/qliteral_p.h>
+#include <private/qnamespaceconstructor_p.h>
+#include <private/qncnameconstructor_p.h>
+#include <private/qnodecomparison_p.h>
+#include <private/qorexpression_p.h>
+#include <private/qpath_p.h>
+#include <private/qpositionalvariablereference_p.h>
+#include <private/qqnameconstructor_p.h>
+#include <private/qqnamevalue_p.h>
+#include <private/qquantifiedexpression_p.h>
+#include <private/qrangeexpression_p.h>
+#include <private/qrangevariablereference_p.h>
+#include <private/qschemadatetime_p.h>
+#include <private/qschematime_p.h>
+#include <private/qsimplecontentconstructor_p.h>
+#include <private/qtreatas_p.h>
+#include <private/qtruthpredicate_p.h>
+#include <private/quntypedatomicconverter_p.h>
+#include <private/quntypedatomic_p.h>
+#include <private/quserfunctioncallsite_p.h>
+#include <private/qvalidationerror_p.h>
+#include <private/qvaluecomparison_p.h>
 
 #include "ExpressionInfo.h"
 #include "Global.h"
diff --git a/tests/auto/xmlpatternssdk/ExpressionNamer.h b/tests/auto/xmlpatternssdk/ExpressionNamer.h
index 297bdc5..6b31671 100644
--- a/tests/auto/xmlpatternssdk/ExpressionNamer.h
+++ b/tests/auto/xmlpatternssdk/ExpressionNamer.h
@@ -43,7 +43,7 @@
 #define PatternistSDK_ExpressionNamer_H
 
 #include "Global.h"
-#include "qexpressiondispatch_p.h"
+#include <private/qexpressiondispatch_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
index 8424389..9ae4089 100644
--- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
@@ -47,9 +47,9 @@
 
 #include "Global.h"
 
-#include "qcommonsequencetypes_p.h"
-#include "qdebug_p.h"
-#include "qatomicstring_p.h"
+#include <private/qcommonsequencetypes_p.h>
+#include <private/qdebug_p.h>
+#include <private/qatomicstring_p.h>
 
 #include "ExternalSourceLoader.h"
 
diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
index 78b544d..6fad8c0 100644
--- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
@@ -46,9 +46,9 @@
 #include <QUrl>
 #include <QXmlQuery>
 
-#include "qdynamiccontext_p.h"
-#include "qresourceloader_p.h"
-#include "qexternalvariableloader_p.h"
+#include <private/qdynamiccontext_p.h>
+#include <private/qresourceloader_p.h>
+#include <private/qexternalvariableloader_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/tests/auto/xmlpatternssdk/Global.h b/tests/auto/xmlpatternssdk/Global.h
index 30a89eb..95e21ac 100644
--- a/tests/auto/xmlpatternssdk/Global.h
+++ b/tests/auto/xmlpatternssdk/Global.h
@@ -44,8 +44,8 @@
 
 #include <QString>
 
-#include "private/qitem_p.h"
-#include "private/qnamepool_p.h"
+#include <private/qitem_p.h>
+#include <private/qnamepool_p.h>
 
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 #   ifdef Q_PATTERNISTSDK_BUILDING
diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.cpp b/tests/auto/xmlpatternssdk/TestBaseLine.cpp
index 065f37f..60cf727 100644
--- a/tests/auto/xmlpatternssdk/TestBaseLine.cpp
+++ b/tests/auto/xmlpatternssdk/TestBaseLine.cpp
@@ -48,7 +48,7 @@
 #include <QXmlAttributes>
 #include <QXmlSimpleReader>
 
-#include "qdebug_p.h"
+#include <private/qdebug_p.h>
 #include "XMLWriter.h"
 
 #include "TestBaseLine.h"
diff --git a/tests/auto/xmlpatternssdk/TestCase.cpp b/tests/auto/xmlpatternssdk/TestCase.cpp
index 4033946..7b40700 100644
--- a/tests/auto/xmlpatternssdk/TestCase.cpp
+++ b/tests/auto/xmlpatternssdk/TestCase.cpp
@@ -45,7 +45,7 @@
 #include <QXmlQuery>
 #include <QXmlResultItems>
 #include <QXmlSerializer>
-#include <qxmlquery_p.h>
+#include <private/qxmlquery_p.h>
 
 #include "DebugExpressionFactory.h"
 #include "ExternalSourceLoader.h"
diff --git a/tests/auto/xmlpatternssdk/TestCase.h b/tests/auto/xmlpatternssdk/TestCase.h
index 100a81c..9a64c88 100644
--- a/tests/auto/xmlpatternssdk/TestCase.h
+++ b/tests/auto/xmlpatternssdk/TestCase.h
@@ -44,7 +44,7 @@
 
 #include <QtXmlPatterns/QXmlQuery>
 
-#include "qexternalvariableloader_p.h"
+#include <private/qexternalvariableloader_p.h>
 
 #include "ErrorHandler.h"
 #include "TestBaseLine.h"
diff --git a/tests/auto/xmlpatternssdk/TestResult.cpp b/tests/auto/xmlpatternssdk/TestResult.cpp
index fda34b0..f7a3ff2 100644
--- a/tests/auto/xmlpatternssdk/TestResult.cpp
+++ b/tests/auto/xmlpatternssdk/TestResult.cpp
@@ -42,7 +42,7 @@
 #include <QXmlAttributes>
 #include <QtDebug>
 
-#include "qdebug_p.h"
+#include <private/qdebug_p.h>
 #include "Global.h"
 #include "XMLWriter.h"
 
diff --git a/tests/auto/xmlpatternssdk/TestSuite.cpp b/tests/auto/xmlpatternssdk/TestSuite.cpp
index e24786a..060132a 100644
--- a/tests/auto/xmlpatternssdk/TestSuite.cpp
+++ b/tests/auto/xmlpatternssdk/TestSuite.cpp
@@ -51,7 +51,7 @@
 #include "XMLWriter.h"
 #include "XSLTTestSuiteHandler.h"
 #include "XSDTestSuiteHandler.h"
-#include "qdebug_p.h"
+#include <private/qdebug_p.h>
 
 #include "TestSuite.h"
 
diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
index 74a6082..3e6e53f 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
@@ -41,8 +41,8 @@
 
 #include <QtDebug>
 
-#include "qacceltreeresourceloader_p.h"
-#include "qnetworkaccessdelegator_p.h"
+#include <private/qacceltreeresourceloader_p.h>
+#include <private/qnetworkaccessdelegator_p.h>
 
 #include "Global.h"
 #include "TestBaseLine.h"
diff --git a/tests/auto/xmlpatternssdk/XQTSTestCase.h b/tests/auto/xmlpatternssdk/XQTSTestCase.h
index 2c809c5..983978e 100644
--- a/tests/auto/xmlpatternssdk/XQTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XQTSTestCase.h
@@ -46,7 +46,7 @@
 #include <QString>
 #include <QUrl>
 
-#include "qexternalvariableloader_p.h"
+#include <private/qexternalvariableloader_p.h>
 
 #include "TestBaseLine.h"
 #include "TestCase.h"
diff --git a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
index 5b6fb90..11d3714 100644
--- a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
@@ -41,8 +41,8 @@
 
 #include <QtDebug>
 
-#include "qacceltreeresourceloader_p.h"
-#include "qnetworkaccessdelegator_p.h"
+#include <private/qacceltreeresourceloader_p.h>
+#include <private/qnetworkaccessdelegator_p.h>
 
 #include "Global.h"
 #include "TestBaseLine.h"
diff --git a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
index 31dfe70..6c084e8 100644
--- a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
@@ -41,8 +41,8 @@
 
 #include <QtDebug>
 
-#include "qacceltreeresourceloader_p.h"
-#include "qnetworkaccessdelegator_p.h"
+#include <private/qacceltreeresourceloader_p.h>
+#include <private/qnetworkaccessdelegator_p.h>
 
 #include "Global.h"
 #include "TestBaseLine.h"