summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/expr
diff options
context:
space:
mode:
Diffstat (limited to 'src/xmlpatterns/expr')
-rw-r--r--src/xmlpatterns/expr/qandexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qapplytemplate_p.h2
-rw-r--r--src/xmlpatterns/expr/qargumentreference_p.h2
-rw-r--r--src/xmlpatterns/expr/qarithmeticexpression_p.h4
-rw-r--r--src/xmlpatterns/expr/qattributeconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qattributenamevalidator_p.h2
-rw-r--r--src/xmlpatterns/expr/qaxisstep_p.h4
-rw-r--r--src/xmlpatterns/expr/qcachecells_p.h2
-rw-r--r--src/xmlpatterns/expr/qcallsite_p.h6
-rw-r--r--src/xmlpatterns/expr/qcalltargetdescription_p.h2
-rw-r--r--src/xmlpatterns/expr/qcalltemplate_p.h6
-rw-r--r--src/xmlpatterns/expr/qcastableas_p.h4
-rw-r--r--src/xmlpatterns/expr/qcastas_p.h4
-rw-r--r--src/xmlpatterns/expr/qcastingplatform_p.h22
-rw-r--r--src/xmlpatterns/expr/qcollationchecker_p.h2
-rw-r--r--src/xmlpatterns/expr/qcombinenodes_p.h2
-rw-r--r--src/xmlpatterns/expr/qcommentconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qcomparisonplatform_p.h14
-rw-r--r--src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qcontextitem_p.h2
-rw-r--r--src/xmlpatterns/expr/qcopyof_p.h2
-rw-r--r--src/xmlpatterns/expr/qcurrentitemstore_p.h2
-rw-r--r--src/xmlpatterns/expr/qdocumentconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qdocumentcontentvalidator_p.h4
-rw-r--r--src/xmlpatterns/expr/qdynamiccontextstore_p.h2
-rw-r--r--src/xmlpatterns/expr/qelementconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qemptycontainer_p.h2
-rw-r--r--src/xmlpatterns/expr/qemptysequence_p.h2
-rw-r--r--src/xmlpatterns/expr/qevaluationcache_p.h12
-rw-r--r--src/xmlpatterns/expr/qexpression_p.h16
-rw-r--r--src/xmlpatterns/expr/qexpressionfactory_p.h4
-rw-r--r--src/xmlpatterns/expr/qexpressionsequence_p.h2
-rw-r--r--src/xmlpatterns/expr/qexpressionvariablereference_p.h4
-rw-r--r--src/xmlpatterns/expr/qexternalvariableloader_p.h6
-rw-r--r--src/xmlpatterns/expr/qexternalvariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/qfirstitempredicate_p.h2
-rw-r--r--src/xmlpatterns/expr/qforclause_p.h2
-rw-r--r--src/xmlpatterns/expr/qgeneralcomparison_p.h6
-rw-r--r--src/xmlpatterns/expr/qgenericpredicate_p.h2
-rw-r--r--src/xmlpatterns/expr/qifthenclause_p.h2
-rw-r--r--src/xmlpatterns/expr/qinstanceof_p.h2
-rw-r--r--src/xmlpatterns/expr/qletclause_p.h4
-rw-r--r--src/xmlpatterns/expr/qliteral_p.h2
-rw-r--r--src/xmlpatterns/expr/qliteralsequence_p.h2
-rw-r--r--src/xmlpatterns/expr/qnamespaceconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qncnameconstructor_p.h6
-rw-r--r--src/xmlpatterns/expr/qnodecomparison_p.h2
-rw-r--r--src/xmlpatterns/expr/qnodesort_p.h2
-rw-r--r--src/xmlpatterns/expr/qoperandsiterator_p.h2
-rw-r--r--src/xmlpatterns/expr/qoptimizationpasses_p.h6
-rw-r--r--src/xmlpatterns/expr/qoptimizerblocks_p.h6
-rw-r--r--src/xmlpatterns/expr/qoptimizerframework_p.h2
-rw-r--r--src/xmlpatterns/expr/qorderby_p.h6
-rw-r--r--src/xmlpatterns/expr/qorexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qpaircontainer_p.h4
-rw-r--r--src/xmlpatterns/expr/qparentnodeaxis_p.h2
-rw-r--r--src/xmlpatterns/expr/qpath_p.h2
-rw-r--r--src/xmlpatterns/expr/qpositionalvariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qqnameconstructor_p.h8
-rw-r--r--src/xmlpatterns/expr/qquantifiedexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qrangeexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qrangevariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/qreturnorderby_p.h4
-rw-r--r--src/xmlpatterns/expr/qsimplecontentconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qsinglecontainer_p.h2
-rw-r--r--src/xmlpatterns/expr/qstaticbaseuristore_p.h2
-rw-r--r--src/xmlpatterns/expr/qstaticcompatibilitystore_p.h2
-rw-r--r--src/xmlpatterns/expr/qtemplate_p.h10
-rw-r--r--src/xmlpatterns/expr/qtemplateinvoker_p.h4
-rw-r--r--src/xmlpatterns/expr/qtemplatemode_p.h2
-rw-r--r--src/xmlpatterns/expr/qtemplateparameterreference_p.h4
-rw-r--r--src/xmlpatterns/expr/qtemplatepattern_p.h2
-rw-r--r--src/xmlpatterns/expr/qtextnodeconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qtreatas_p.h2
-rw-r--r--src/xmlpatterns/expr/qtriplecontainer_p.h2
-rw-r--r--src/xmlpatterns/expr/qtruthpredicate_p.h2
-rw-r--r--src/xmlpatterns/expr/qunaryexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qunlimitedcontainer_p.h4
-rw-r--r--src/xmlpatterns/expr/qunresolvedvariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/quserfunction_p.h6
-rw-r--r--src/xmlpatterns/expr/quserfunctioncallsite_p.h10
-rw-r--r--src/xmlpatterns/expr/qvalidate_p.h2
-rw-r--r--src/xmlpatterns/expr/qvaluecomparison_p.h6
-rw-r--r--src/xmlpatterns/expr/qvariabledeclaration_p.h6
-rw-r--r--src/xmlpatterns/expr/qvariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/qwithparam_p.h2
-rw-r--r--src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h2
88 files changed, 162 insertions, 162 deletions
diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h
index d3237ea..95e5195 100644
--- a/src/xmlpatterns/expr/qandexpression_p.h
+++ b/src/xmlpatterns/expr/qandexpression_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_AndExpression_H
#define Patternist_AndExpression_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h
index 4985f27..0971d93 100644
--- a/src/xmlpatterns/expr/qapplytemplate_p.h
+++ b/src/xmlpatterns/expr/qapplytemplate_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_ApplyTemplate_H
#define Patternist_ApplyTemplate_H
-#include "qtemplatemode_p.h"
+#include <private/qtemplatemode_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h
index dda913f..827ee3a 100644
--- a/src/xmlpatterns/expr/qargumentreference_p.h
+++ b/src/xmlpatterns/expr/qargumentreference_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_ArgumentReference_H
#define Patternist_ArgumentReference_H
-#include "qvariablereference_p.h"
+#include <private/qvariablereference_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h
index ed0c3cc..16b27b9 100644
--- a/src/xmlpatterns/expr/qarithmeticexpression_p.h
+++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_ArithmeticExpression_H
#define Patternist_ArithmeticExpression_H
-#include "qatomicmathematician_p.h"
-#include "qpaircontainer_p.h"
+#include <private/qatomicmathematician_p.h>
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h
index 52cfb6e..076d064 100644
--- a/src/xmlpatterns/expr/qattributeconstructor_p.h
+++ b/src/xmlpatterns/expr/qattributeconstructor_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_AttributeConstructor_H
#define Patternist_AttributeConstructor_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h
index f723459..5965f02 100644
--- a/src/xmlpatterns/expr/qattributenamevalidator_p.h
+++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_AttributeNameValidator_H
#define Patternist_AttributeNameValidator_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h
index 2a1428a..7267e87 100644
--- a/src/xmlpatterns/expr/qaxisstep_p.h
+++ b/src/xmlpatterns/expr/qaxisstep_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_AxisStep_H
#define Patternist_AxisStep_H
-#include "qemptycontainer_p.h"
-#include "qitem_p.h"
+#include <private/qemptycontainer_p.h>
+#include <private/qitem_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcachecells_p.h b/src/xmlpatterns/expr/qcachecells_p.h
index 3c1916d..48f1693 100644
--- a/src/xmlpatterns/expr/qcachecells_p.h
+++ b/src/xmlpatterns/expr/qcachecells_p.h
@@ -55,7 +55,7 @@
#include <QList>
#include <QVector>
-#include "qitem_p.h"
+#include <private/qitem_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcallsite_p.h b/src/xmlpatterns/expr/qcallsite_p.h
index 92b20e0..064532e 100644
--- a/src/xmlpatterns/expr/qcallsite_p.h
+++ b/src/xmlpatterns/expr/qcallsite_p.h
@@ -52,9 +52,9 @@
#ifndef Patternist_CallSite_H
#define Patternist_CallSite_H
-#include "qunlimitedcontainer_p.h"
-#include "qcalltargetdescription_p.h"
-#include "qxmlname.h"
+#include <private/qunlimitedcontainer_p.h>
+#include <private/qcalltargetdescription_p.h>
+#include <QXmlName>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h
index f2b23d7..06a54da 100644
--- a/src/xmlpatterns/expr/qcalltargetdescription_p.h
+++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h
@@ -57,7 +57,7 @@ template<typename T> class QList;
#include <QSharedData>
-#include "qexpression_p.h"
+#include <private/qexpression_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h
index 06d268b..017c1ab 100644
--- a/src/xmlpatterns/expr/qcalltemplate_p.h
+++ b/src/xmlpatterns/expr/qcalltemplate_p.h
@@ -52,9 +52,9 @@
#ifndef Patternist_CallTemplate_H
#define Patternist_CallTemplate_H
-#include "qcallsite_p.h"
-#include "qtemplateinvoker_p.h"
-#include "qtemplate_p.h"
+#include <private/qcallsite_p.h>
+#include <private/qtemplateinvoker_p.h>
+#include <private/qtemplate_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h
index f54d334..b5b7905 100644
--- a/src/xmlpatterns/expr/qcastableas_p.h
+++ b/src/xmlpatterns/expr/qcastableas_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_CastableAs_H
#define Patternist_CastableAs_H
-#include "qsinglecontainer_p.h"
-#include "qcastingplatform_p.h"
+#include <private/qsinglecontainer_p.h>
+#include <private/qcastingplatform_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h
index 90463cb..c77caa6 100644
--- a/src/xmlpatterns/expr/qcastas_p.h
+++ b/src/xmlpatterns/expr/qcastas_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_CastAs_H
#define Patternist_CastAs_H
-#include "qsinglecontainer_p.h"
-#include "qcastingplatform_p.h"
+#include <private/qsinglecontainer_p.h>
+#include <private/qcastingplatform_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcastingplatform_p.h b/src/xmlpatterns/expr/qcastingplatform_p.h
index 6d7a0aa..aafa681 100644
--- a/src/xmlpatterns/expr/qcastingplatform_p.h
+++ b/src/xmlpatterns/expr/qcastingplatform_p.h
@@ -52,17 +52,17 @@
#ifndef Patternist_CastingPlatform_H
#define Patternist_CastingPlatform_H
-#include "qatomiccasterlocator_p.h"
-#include "qatomiccaster_p.h"
-#include "qatomicstring_p.h"
-#include "qatomictype_p.h"
-#include "qbuiltintypes_p.h"
-#include "qcommonsequencetypes_p.h"
-#include "qpatternistlocale_p.h"
-#include "qqnamevalue_p.h"
-#include "qschematypefactory_p.h"
-#include "qstaticcontext_p.h"
-#include "qvalidationerror_p.h"
+#include <private/qatomiccasterlocator_p.h>
+#include <private/qatomiccaster_p.h>
+#include <private/qatomicstring_p.h>
+#include <private/qatomictype_p.h>
+#include <private/qbuiltintypes_p.h>
+#include <private/qcommonsequencetypes_p.h>
+#include <private/qpatternistlocale_p.h>
+#include <private/qqnamevalue_p.h>
+#include <private/qschematypefactory_p.h>
+#include <private/qstaticcontext_p.h>
+#include <private/qvalidationerror_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h
index 8d62c33..5cdf485 100644
--- a/src/xmlpatterns/expr/qcollationchecker_p.h
+++ b/src/xmlpatterns/expr/qcollationchecker_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_CollationChecker_H
#define Patternist_CollationChecker_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h
index c586929..75b9e28 100644
--- a/src/xmlpatterns/expr/qcombinenodes_p.h
+++ b/src/xmlpatterns/expr/qcombinenodes_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_CombineNodes_H
#define Patternist_CombineNodes_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h
index 4799bb1..ceb6688 100644
--- a/src/xmlpatterns/expr/qcommentconstructor_p.h
+++ b/src/xmlpatterns/expr/qcommentconstructor_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_CommentConstructor_H
#define Patternist_CommentConstructor_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcomparisonplatform_p.h b/src/xmlpatterns/expr/qcomparisonplatform_p.h
index 49fc181..6037f74 100644
--- a/src/xmlpatterns/expr/qcomparisonplatform_p.h
+++ b/src/xmlpatterns/expr/qcomparisonplatform_p.h
@@ -52,13 +52,13 @@
#ifndef Patternist_ComparisonPlatform_H
#define Patternist_ComparisonPlatform_H
-#include "qatomiccomparators_p.h"
-#include "qitem_p.h"
-#include "qcommonsequencetypes_p.h"
-#include "qdynamiccontext_p.h"
-#include "qbuiltintypes_p.h"
-#include "qitemtype_p.h"
-#include "qpatternistlocale_p.h"
+#include <private/qatomiccomparators_p.h>
+#include <private/qitem_p.h>
+#include <private/qcommonsequencetypes_p.h>
+#include <private/qdynamiccontext_p.h>
+#include <private/qbuiltintypes_p.h>
+#include <private/qitemtype_p.h>
+#include <private/qpatternistlocale_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
index d76942c..da9d400 100644
--- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_ComputedNamespaceConstructor_H
#define Patternist_ComputedNamespaceConstructor_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h
index 78b988c..48df32a 100644
--- a/src/xmlpatterns/expr/qcontextitem_p.h
+++ b/src/xmlpatterns/expr/qcontextitem_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_ContextItem_H
#define Patternist_ContextItem_H
-#include "qemptycontainer_p.h"
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h
index a68911c..722462f 100644
--- a/src/xmlpatterns/expr/qcopyof_p.h
+++ b/src/xmlpatterns/expr/qcopyof_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_CopyOf_H
#define Patternist_CopyOf_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h
index c67d77b..30a2248 100644
--- a/src/xmlpatterns/expr/qcurrentitemstore_p.h
+++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_CurrentItemStore_H
#define Patternist_CurrentItemStore_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h
index 6340d59..af271b6 100644
--- a/src/xmlpatterns/expr/qdocumentconstructor_p.h
+++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h
@@ -54,7 +54,7 @@
#include <QUrl>
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
index 368db4d..41f3ed7 100644
--- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
+++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_DocumentContentValidator_H
#define Patternist_DocumentContentValidator_H
-#include "qdynamiccontext_p.h"
-#include "qexpression_p.h"
+#include <private/qdynamiccontext_p.h>
+#include <private/qexpression_p.h>
#include "qabstractxmlreceiver.h"
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
index f1416ad..5145403 100644
--- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h
+++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_DynamicContextStore_H
#define Patternist_DynamicContextStore_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h
index 3a21462..6e51474 100644
--- a/src/xmlpatterns/expr/qelementconstructor_p.h
+++ b/src/xmlpatterns/expr/qelementconstructor_p.h
@@ -54,7 +54,7 @@
#include <QUrl>
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h
index 70dd243..ce36d23 100644
--- a/src/xmlpatterns/expr/qemptycontainer_p.h
+++ b/src/xmlpatterns/expr/qemptycontainer_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_EmptyContainer_H
#define Patternist_EmptyContainer_H
-#include "qexpression_p.h"
+#include <private/qexpression_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h
index 30f225b..196a4c6 100644
--- a/src/xmlpatterns/expr/qemptysequence_p.h
+++ b/src/xmlpatterns/expr/qemptysequence_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_EmptySequence_H
#define Patternist_EmptySequence_H
-#include "qemptycontainer_p.h"
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h
index e58c7cd..3b47ba5 100644
--- a/src/xmlpatterns/expr/qevaluationcache_p.h
+++ b/src/xmlpatterns/expr/qevaluationcache_p.h
@@ -52,12 +52,12 @@
#ifndef Patternist_EvaluationCache_H
#define Patternist_EvaluationCache_H
-#include "qcachingiterator_p.h"
-#include "qcommonsequencetypes_p.h"
-#include "qnodebuilder_p.h"
-#include "qoperandsiterator_p.h"
-#include "qsinglecontainer_p.h"
-#include "qvariabledeclaration_p.h"
+#include <private/qcachingiterator_p.h>
+#include <private/qcommonsequencetypes_p.h>
+#include <private/qnodebuilder_p.h>
+#include <private/qoperandsiterator_p.h>
+#include <private/qsinglecontainer_p.h>
+#include <private/qvariabledeclaration_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h
index 695b7c6..73a2d40 100644
--- a/src/xmlpatterns/expr/qexpression_p.h
+++ b/src/xmlpatterns/expr/qexpression_p.h
@@ -55,14 +55,14 @@
#include <QFlags>
#include <QSharedData>
-#include "qcppcastinghelper_p.h"
-#include "qdebug_p.h"
-#include "qdynamiccontext_p.h"
-#include "qexpressiondispatch_p.h"
-#include "qitem_p.h"
-#include "qsequencetype_p.h"
-#include "qsourcelocationreflection_p.h"
-#include "qstaticcontext_p.h"
+#include <private/qcppcastinghelper_p.h>
+#include <private/qdebug_p.h>
+#include <private/qdynamiccontext_p.h>
+#include <private/qexpressiondispatch_p.h>
+#include <private/qitem_p.h>
+#include <private/qsequencetype_p.h>
+#include <private/qsourcelocationreflection_p.h>
+#include <private/qstaticcontext_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qexpressionfactory_p.h b/src/xmlpatterns/expr/qexpressionfactory_p.h
index 6a9d744..8ad7b9f 100644
--- a/src/xmlpatterns/expr/qexpressionfactory_p.h
+++ b/src/xmlpatterns/expr/qexpressionfactory_p.h
@@ -54,8 +54,8 @@
#include <QXmlQuery>
-#include "qexpression_p.h"
-#include "qtokenizer_p.h"
+#include <private/qexpression_p.h>
+#include <private/qtokenizer_p.h>
#include <QSharedData>
#include <QUrl>
diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h
index 5df7ee8..61728ec 100644
--- a/src/xmlpatterns/expr/qexpressionsequence_p.h
+++ b/src/xmlpatterns/expr/qexpressionsequence_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_ExpressionSequence_H
#define Patternist_ExpressionSequence_H
-#include "qunlimitedcontainer_p.h"
+#include <private/qunlimitedcontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
index 9f80684..7d3338a 100644
--- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_ExpressionVariableReference_H
#define Patternist_ExpressionVariableReference_H
-#include "qvariabledeclaration_p.h"
-#include "qvariablereference_p.h"
+#include <private/qvariabledeclaration_p.h>
+#include <private/qvariablereference_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qexternalvariableloader_p.h b/src/xmlpatterns/expr/qexternalvariableloader_p.h
index 7d97eb0..3a45cef 100644
--- a/src/xmlpatterns/expr/qexternalvariableloader_p.h
+++ b/src/xmlpatterns/expr/qexternalvariableloader_p.h
@@ -52,9 +52,9 @@
#ifndef Patternist_ExternalVariableLoader_H
#define Patternist_ExternalVariableLoader_H
-#include "qitem_p.h"
-#include "qsequencetype_p.h"
-#include "qxmlname.h"
+#include <private/qitem_p.h>
+#include <private/qsequencetype_p.h>
+#include <QXmlName>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h
index 78314f6..a73d7ae 100644
--- a/src/xmlpatterns/expr/qexternalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_ExternalVariableReference_H
#define Patternist_ExternalVariableReference_H
-#include "qemptycontainer_p.h"
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h
index d3d8a6d..787ba55 100644
--- a/src/xmlpatterns/expr/qfirstitempredicate_p.h
+++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_FirstItemPredicate_H
#define Patternist_FirstItemPredicate_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h
index 2ad5e2f..f9a9447 100644
--- a/src/xmlpatterns/expr/qforclause_p.h
+++ b/src/xmlpatterns/expr/qforclause_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_ForClause_H
#define Patternist_ForClause_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h
index 9321dc7..264cc04 100644
--- a/src/xmlpatterns/expr/qgeneralcomparison_p.h
+++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h
@@ -52,9 +52,9 @@
#ifndef Patternist_GeneralComparison_H
#define Patternist_GeneralComparison_H
-#include "qatomiccomparator_p.h"
-#include "qpaircontainer_p.h"
-#include "qcomparisonplatform_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qpaircontainer_p.h>
+#include <private/qcomparisonplatform_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h
index 533745a..05040e3 100644
--- a/src/xmlpatterns/expr/qgenericpredicate_p.h
+++ b/src/xmlpatterns/expr/qgenericpredicate_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_GenericPredicate_H
#define Patternist_GenericPredicate_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h
index c5a533c..0cce71a 100644
--- a/src/xmlpatterns/expr/qifthenclause_p.h
+++ b/src/xmlpatterns/expr/qifthenclause_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_IfThenClause_H
#define Patternist_IfThenClause_H
-#include "qtriplecontainer_p.h"
+#include <private/qtriplecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h
index 62f4625..8d2d0a3 100644
--- a/src/xmlpatterns/expr/qinstanceof_p.h
+++ b/src/xmlpatterns/expr/qinstanceof_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_InstanceOf_H
#define Patternist_InstanceOf_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h
index cd5f5da..ef884e7 100644
--- a/src/xmlpatterns/expr/qletclause_p.h
+++ b/src/xmlpatterns/expr/qletclause_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_LetClause_H
#define Patternist_LetClause_H
-#include "qpaircontainer_p.h"
-#include "qvariabledeclaration_p.h"
+#include <private/qpaircontainer_p.h>
+#include <private/qvariabledeclaration_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h
index 42f8ec3..14eae28 100644
--- a/src/xmlpatterns/expr/qliteral_p.h
+++ b/src/xmlpatterns/expr/qliteral_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_Literal_H
#define Patternist_Literal_H
-#include "qemptycontainer_p.h"
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h
index f809f6d..b126fd3 100644
--- a/src/xmlpatterns/expr/qliteralsequence_p.h
+++ b/src/xmlpatterns/expr/qliteralsequence_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_LiteralSequence_H
#define Patternist_LiteralSequence_H
-#include "qemptycontainer_p.h"
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
index bd2b784..ceeaec6 100644
--- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_NamespaceConstructor_H
#define Patternist_NamespaceConstructor_H
-#include "qemptycontainer_p.h"
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h
index 8c5f265..9479e8a 100644
--- a/src/xmlpatterns/expr/qncnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qncnameconstructor_p.h
@@ -52,9 +52,9 @@
#ifndef Patternist_NCNameConstructor_H
#define Patternist_NCNameConstructor_H
-#include "qsinglecontainer_p.h"
-#include "qpatternistlocale_p.h"
-#include "private/qxmlutils_p.h"
+#include <private/qsinglecontainer_p.h>
+#include <private/qpatternistlocale_p.h>
+#include <private/qxmlutils_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h
index 2b1ba09..b3bbb48 100644
--- a/src/xmlpatterns/expr/qnodecomparison_p.h
+++ b/src/xmlpatterns/expr/qnodecomparison_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_NodeComparison_H
#define Patternist_NodeComparison_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h
index c666b75..f5be80e 100644
--- a/src/xmlpatterns/expr/qnodesort_p.h
+++ b/src/xmlpatterns/expr/qnodesort_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_NodeSortExpression_H
#define Patternist_NodeSortExpression_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qoperandsiterator_p.h b/src/xmlpatterns/expr/qoperandsiterator_p.h
index 075feb6..2a7fb19 100644
--- a/src/xmlpatterns/expr/qoperandsiterator_p.h
+++ b/src/xmlpatterns/expr/qoperandsiterator_p.h
@@ -55,7 +55,7 @@
#include <QPair>
#include <QStack>
-#include "qexpression_p.h"
+#include <private/qexpression_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qoptimizationpasses_p.h b/src/xmlpatterns/expr/qoptimizationpasses_p.h
index 6d6d339..32116d2 100644
--- a/src/xmlpatterns/expr/qoptimizationpasses_p.h
+++ b/src/xmlpatterns/expr/qoptimizationpasses_p.h
@@ -52,9 +52,9 @@
#ifndef Patternist_OptimizationBlocks_H
#define Patternist_OptimizationBlocks_H
-#include "qatomiccomparator_p.h"
-#include "qexpression_p.h"
-#include "qoptimizerframework_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qexpression_p.h>
+#include <private/qoptimizerframework_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h
index 054b50f..99f18d7 100644
--- a/src/xmlpatterns/expr/qoptimizerblocks_p.h
+++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h
@@ -52,9 +52,9 @@
#ifndef Patternist_OptimizerBlocks_H
#define Patternist_OptimizerBlocks_H
-#include "qatomiccomparator_p.h"
-#include "qexpression_p.h"
-#include "qoptimizerframework_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qexpression_p.h>
+#include <private/qoptimizerframework_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qoptimizerframework_p.h b/src/xmlpatterns/expr/qoptimizerframework_p.h
index 87fe4ab..c26f982 100644
--- a/src/xmlpatterns/expr/qoptimizerframework_p.h
+++ b/src/xmlpatterns/expr/qoptimizerframework_p.h
@@ -54,7 +54,7 @@
#include <QSharedData>
-#include "qexpression_p.h"
+#include <private/qexpression_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h
index 7d7a22d..800ec28 100644
--- a/src/xmlpatterns/expr/qorderby_p.h
+++ b/src/xmlpatterns/expr/qorderby_p.h
@@ -52,9 +52,9 @@
#ifndef Patternist_OrderBy_H
#define Patternist_OrderBy_H
-#include "qatomiccomparator_p.h"
-#include "qcomparisonplatform_p.h"
-#include "qsinglecontainer_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qcomparisonplatform_p.h>
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h
index dbc1da9..62c04bc 100644
--- a/src/xmlpatterns/expr/qorexpression_p.h
+++ b/src/xmlpatterns/expr/qorexpression_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_OrExpression_H
#define Patternist_OrExpression_H
-#include "qandexpression_p.h"
+#include <private/qandexpression_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h
index 1fb85e2..6a80e04 100644
--- a/src/xmlpatterns/expr/qpaircontainer_p.h
+++ b/src/xmlpatterns/expr/qpaircontainer_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_PairContainer_H
#define Patternist_PairContainer_H
-#include "qexpression_p.h"
-#include "qatomictype_p.h"
+#include <private/qexpression_p.h>
+#include <private/qatomictype_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h
index e6932a3..1d390f8 100644
--- a/src/xmlpatterns/expr/qparentnodeaxis_p.h
+++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_ParentNodeAxis_H
#define Patternist_ParentNodeAxis_H
-#include "qemptycontainer_p.h"
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h
index 37ce2a1..aeddb91 100644
--- a/src/xmlpatterns/expr/qpath_p.h
+++ b/src/xmlpatterns/expr/qpath_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_Path_H
#define Patternist_Path_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
index 54f6805..342a473 100644
--- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_PositionVariableReference_H
#define Patternist_PositionVariableReference_H
-#include "qvariablereference_p.h"
+#include <private/qvariablereference_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
index 52d4064..7ef06b2 100644
--- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
+++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_ProcessingInstructionConstructor_H
#define Patternist_ProcessingInstructionConstructor_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h
index d59a992..7e7a7c8 100644
--- a/src/xmlpatterns/expr/qqnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qqnameconstructor_p.h
@@ -52,10 +52,10 @@
#ifndef Patternist_QNameConstructor_H
#define Patternist_QNameConstructor_H
-#include "qsinglecontainer_p.h"
-#include "qbuiltintypes_p.h"
-#include "qpatternistlocale_p.h"
-#include "qxpathhelper_p.h"
+#include <private/qsinglecontainer_p.h>
+#include <private/qbuiltintypes_p.h>
+#include <private/qpatternistlocale_p.h>
+#include <private/qxpathhelper_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h
index 48924ae..fdf8645 100644
--- a/src/xmlpatterns/expr/qquantifiedexpression_p.h
+++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_QuantifiedExpression_H
#define Patternist_QuantifiedExpression_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h
index 2b59385..c0ad660 100644
--- a/src/xmlpatterns/expr/qrangeexpression_p.h
+++ b/src/xmlpatterns/expr/qrangeexpression_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_RangeExpression_H
#define Patternist_RangeExpression_H
-#include "qpaircontainer_p.h"
+#include <private/qpaircontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h
index 73d0cfb..187bcdc 100644
--- a/src/xmlpatterns/expr/qrangevariablereference_p.h
+++ b/src/xmlpatterns/expr/qrangevariablereference_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_RangeVariableReference_H
#define Patternist_RangeVariableReference_H
-#include "qvariablereference_p.h"
+#include <private/qvariablereference_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h
index fdc441a..e3678d1 100644
--- a/src/xmlpatterns/expr/qreturnorderby_p.h
+++ b/src/xmlpatterns/expr/qreturnorderby_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_ReturnOrderBy_H
#define Patternist_ReturnOrderBy_H
-#include "qorderby_p.h"
-#include "qunlimitedcontainer_p.h"
+#include <private/qorderby_p.h>
+#include <private/qunlimitedcontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
index 0082d23..f636567 100644
--- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_SimpleContentConstructor_H
#define Patternist_SimpleContentConstructor_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h
index b4d9ae4..834fcbf 100644
--- a/src/xmlpatterns/expr/qsinglecontainer_p.h
+++ b/src/xmlpatterns/expr/qsinglecontainer_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_SingleContainer_H
#define Patternist_SingleContainer_H
-#include "qexpression_p.h"
+#include <private/qexpression_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
index 462f463..bcacd26 100644
--- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h
+++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_StaticBaseURIStore_H
#define Patternist_StaticBaseURIStore_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
index d520984..5a5aea5 100644
--- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
+++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_StaticCompatibilityStore_H
#define Patternist_StaticCompatibilityStore_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h
index ae1ca08..14f86be 100644
--- a/src/xmlpatterns/expr/qtemplate_p.h
+++ b/src/xmlpatterns/expr/qtemplate_p.h
@@ -55,11 +55,11 @@
#include <QSharedData>
#include <QVector>
-#include "qdynamiccontext_p.h"
-#include "qexpression_p.h"
-#include "qsourcelocationreflection_p.h"
-#include "qtemplateinvoker_p.h"
-#include "qvariabledeclaration_p.h"
+#include <private/qdynamiccontext_p.h>
+#include <private/qexpression_p.h>
+#include <private/qsourcelocationreflection_p.h>
+#include <private/qtemplateinvoker_p.h>
+#include <private/qvariabledeclaration_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h
index b1362fb..6aff77b 100644
--- a/src/xmlpatterns/expr/qtemplateinvoker_p.h
+++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_TemplateInvoker_H
#define Patternist_TemplateInvoker_H
-#include "qcallsite_p.h"
-#include "qwithparam_p.h"
+#include <private/qcallsite_p.h>
+#include <private/qwithparam_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/qtemplatemode_p.h b/src/xmlpatterns/expr/qtemplatemode_p.h
index c05ed06..d0e5dcf 100644
--- a/src/xmlpatterns/expr/qtemplatemode_p.h
+++ b/src/xmlpatterns/expr/qtemplatemode_p.h
@@ -55,7 +55,7 @@
#include <QtCore/QSharedData>
#include <QXmlName>
-#include "qtemplatepattern_p.h"
+#include <private/qtemplatepattern_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
index c7d3d62..8510006 100644
--- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h
+++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
@@ -52,8 +52,8 @@
#ifndef Patternist_TemplateParameterReference_H
#define Patternist_TemplateParameterReference_H
-#include "qvariabledeclaration_p.h"
-#include "qemptycontainer_p.h"
+#include <private/qvariabledeclaration_p.h>
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/qtemplatepattern_p.h b/src/xmlpatterns/expr/qtemplatepattern_p.h
index 0b656be..97b2b8e 100644
--- a/src/xmlpatterns/expr/qtemplatepattern_p.h
+++ b/src/xmlpatterns/expr/qtemplatepattern_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_TemplatePattern_H
#define Patternist_TemplatePattern_H
-#include "qtemplate_p.h"
+#include <private/qtemplate_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
index 8862e6f..fb53bc1 100644
--- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h
+++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_TextNodeConstructor_H
#define Patternist_TextNodeConstructor_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h
index 341b226..0e9a98e 100644
--- a/src/xmlpatterns/expr/qtreatas_p.h
+++ b/src/xmlpatterns/expr/qtreatas_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_TreatAs_H
#define Patternist_TreatAs_H
-#include "qsinglecontainer_p.h"
+#include <private/qsinglecontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h
index c2f0dfc..caed4c1 100644
--- a/src/xmlpatterns/expr/qtriplecontainer_p.h
+++ b/src/xmlpatterns/expr/qtriplecontainer_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_TripleContainer_H
#define Patternist_TripleContainer_H
-#include "qexpression_p.h"
+#include <private/qexpression_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h
index 7e9bdeb..c450551 100644
--- a/src/xmlpatterns/expr/qtruthpredicate_p.h
+++ b/src/xmlpatterns/expr/qtruthpredicate_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_TruthPredicate_H
#define Patternist_TruthPredicate_H
-#include "qgenericpredicate_p.h"
+#include <private/qgenericpredicate_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h
index fb50563..b5fcdbc 100644
--- a/src/xmlpatterns/expr/qunaryexpression_p.h
+++ b/src/xmlpatterns/expr/qunaryexpression_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-#include "qarithmeticexpression_p.h"
+#include <private/qarithmeticexpression_p.h>
namespace QPatternist
{
diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
index ab0e64c..8148627 100644
--- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h
+++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
@@ -53,8 +53,8 @@
#define Patternist_UnlimitedContainer_H
#include <QList>
-#include "qexpression_p.h"
-#include "qgenericsequencetype_p.h"
+#include <private/qexpression_p.h>
+#include <private/qgenericsequencetype_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
index 3c9e365..1d8ebaa 100644
--- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
+++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_UnresolvedVariableReference_H
#define Patternist_UnresolvedVariableReference_H
-#include "qemptycontainer_p.h"
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h
index 84b7e41..f58681d 100644
--- a/src/xmlpatterns/expr/quserfunction_p.h
+++ b/src/xmlpatterns/expr/quserfunction_p.h
@@ -56,9 +56,9 @@ template<typename T> class QList;
#include <QSharedData>
-#include "qexpression_p.h"
-#include "qfunctionsignature_p.h"
-#include "qvariabledeclaration_p.h"
+#include <private/qexpression_p.h>
+#include <private/qfunctionsignature_p.h>
+#include <private/qvariabledeclaration_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
index 87ca242..9b6ae7d 100644
--- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h
+++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
@@ -52,11 +52,11 @@
#ifndef Patternist_UserFunctionCallsite_H
#define Patternist_UserFunctionCallsite_H
-#include "qcallsite_p.h"
-#include "qfunctionsignature_p.h"
-#include "qunlimitedcontainer_p.h"
-#include "quserfunction_p.h"
-#include "qvariabledeclaration_p.h"
+#include <private/qcallsite_p.h>
+#include <private/qfunctionsignature_p.h>
+#include <private/qunlimitedcontainer_p.h>
+#include <private/quserfunction_p.h>
+#include <private/qvariabledeclaration_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/expr/qvalidate_p.h b/src/xmlpatterns/expr/qvalidate_p.h
index 4fa9ef7..a7f36e9 100644
--- a/src/xmlpatterns/expr/qvalidate_p.h
+++ b/src/xmlpatterns/expr/qvalidate_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_Validate_H
#define Patternist_Validate_H
-#include "qexpression_p.h"
+#include <private/qexpression_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h
index 0c67998..77d9382 100644
--- a/src/xmlpatterns/expr/qvaluecomparison_p.h
+++ b/src/xmlpatterns/expr/qvaluecomparison_p.h
@@ -52,9 +52,9 @@
#ifndef Patternist_ValueComparison_H
#define Patternist_ValueComparison_H
-#include "qatomiccomparator_p.h"
-#include "qpaircontainer_p.h"
-#include "qcomparisonplatform_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qpaircontainer_p.h>
+#include <private/qcomparisonplatform_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qvariabledeclaration_p.h b/src/xmlpatterns/expr/qvariabledeclaration_p.h
index 3801db8..5eba0ec 100644
--- a/src/xmlpatterns/expr/qvariabledeclaration_p.h
+++ b/src/xmlpatterns/expr/qvariabledeclaration_p.h
@@ -54,9 +54,9 @@
#include <QSharedData>
-#include "qexpression_p.h"
-#include "qpatternistlocale_p.h"
-#include "qvariablereference_p.h"
+#include <private/qexpression_p.h>
+#include <private/qpatternistlocale_p.h>
+#include <private/qvariablereference_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h
index 97f447c..b5a50f0 100644
--- a/src/xmlpatterns/expr/qvariablereference_p.h
+++ b/src/xmlpatterns/expr/qvariablereference_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_VariableReference_H
#define Patternist_VariableReference_H
-#include "qemptycontainer_p.h"
+#include <private/qemptycontainer_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qwithparam_p.h b/src/xmlpatterns/expr/qwithparam_p.h
index 9a1da63..54a66d9 100644
--- a/src/xmlpatterns/expr/qwithparam_p.h
+++ b/src/xmlpatterns/expr/qwithparam_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_TemplateParam_H
#define Patternist_TemplateParam_H
-#include "qfunctionargument_p.h"
+#include <private/qfunctionargument_p.h>
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
index 56d0027..dde3d33 100644
--- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
@@ -52,7 +52,7 @@
#ifndef Patternist_XSLTSimpleContentConstructor_H
#define Patternist_XSLTSimpleContentConstructor_H
-#include "qsimplecontentconstructor_p.h"
+#include <private/qsimplecontentconstructor_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE