diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-03 10:57:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-11 06:51:03 +0100 |
| commit | ede75fb49c9ed59304976b8ba1523874771f7c87 (patch) | |
| tree | 174c73cd464a81aa3d41cf664f537255852db3d7 /src/xmlpatterns/utils | |
| parent | b483ca39bde8af3f325d65c767c9445a6c152c5c (diff) | |
| download | qtxmlpatterns-ede75fb49c9ed59304976b8ba1523874771f7c87.tar.gz | |
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>
Diffstat (limited to 'src/xmlpatterns/utils')
| -rw-r--r-- | src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/utils/qgenericnamespaceresolver_p.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/utils/qnamespacebinding_p.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/utils/qnodenamespaceresolver_p.h | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/utils/qoutputvalidator_p.h | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/utils/qpatternistlocale_p.h | 6 | ||||
| -rw-r--r-- | src/xmlpatterns/utils/qxpathhelper_p.h | 8 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h index 92ff0b2..9abc1b9 100644 --- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h @@ -54,7 +54,7 @@ #include <QHash> -#include "qnamespaceresolver_p.h" +#include <private/qnamespaceresolver_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h index 3088da7..c1b697d 100644 --- a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h @@ -54,7 +54,7 @@ #include <QHash> -#include "qnamespaceresolver_p.h" +#include <private/qnamespaceresolver_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qnamespacebinding_p.h b/src/xmlpatterns/utils/qnamespacebinding_p.h index 255cc13..ba448e7 100644 --- a/src/xmlpatterns/utils/qnamespacebinding_p.h +++ b/src/xmlpatterns/utils/qnamespacebinding_p.h @@ -54,7 +54,7 @@ template<typename T> class QVector; -#include "qxmlname.h" +#include <QXmlName> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h index 19eab12..4ac9d30 100644 --- a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h @@ -54,8 +54,8 @@ #include <QHash> -#include "qnamespaceresolver_p.h" -#include "qitem_p.h" +#include <private/qnamespaceresolver_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qoutputvalidator_p.h b/src/xmlpatterns/utils/qoutputvalidator_p.h index 5ca1b0e..ce99f02 100644 --- a/src/xmlpatterns/utils/qoutputvalidator_p.h +++ b/src/xmlpatterns/utils/qoutputvalidator_p.h @@ -54,9 +54,9 @@ #include <QSet> -#include "qdynamiccontext_p.h" +#include <private/qdynamiccontext_p.h> #include "qabstractxmlreceiver.h" -#include "qsourcelocationreflection_p.h" +#include <private/qsourcelocationreflection_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qpatternistlocale_p.h b/src/xmlpatterns/utils/qpatternistlocale_p.h index 7530d18..f065d97 100644 --- a/src/xmlpatterns/utils/qpatternistlocale_p.h +++ b/src/xmlpatterns/utils/qpatternistlocale_p.h @@ -56,9 +56,9 @@ #include <QString> #include <QUrl> -#include "qcardinality_p.h" -#include "qnamepool_p.h" -#include "qprimitives_p.h" +#include <private/qcardinality_p.h> +#include <private/qnamepool_p.h> +#include <private/qprimitives_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qxpathhelper_p.h b/src/xmlpatterns/utils/qxpathhelper_p.h index b041f01..e004c8a 100644 --- a/src/xmlpatterns/utils/qxpathhelper_p.h +++ b/src/xmlpatterns/utils/qxpathhelper_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_XPathHelper_H #define Patternist_XPathHelper_H -#include "qcommonnamespaces_p.h" -#include "qitem_p.h" -#include "qpatternistlocale_p.h" -#include "qreportcontext_p.h" +#include <private/qcommonnamespaces_p.h> +#include <private/qitem_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qreportcontext_p.h> QT_BEGIN_HEADER |