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/acceltree | |
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/acceltree')
-rw-r--r-- | src/xmlpatterns/acceltree/qacceliterators_p.h | 4 | ||||
-rw-r--r-- | src/xmlpatterns/acceltree/qacceltree_p.h | 4 | ||||
-rw-r--r-- | src/xmlpatterns/acceltree/qacceltreebuilder_p.h | 18 | ||||
-rw-r--r-- | src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h | 14 |
4 files changed, 20 insertions, 20 deletions
diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h index c35223e..2674712 100644 --- a/src/xmlpatterns/acceltree/qacceliterators_p.h +++ b/src/xmlpatterns/acceltree/qacceliterators_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_AccelIterators_H #define Patternist_AccelIterators_H -#include "qacceltree_p.h" -#include "qitem_p.h" +#include <private/qacceltree_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/acceltree/qacceltree_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h index f2c4d36..023d27e 100644 --- a/src/xmlpatterns/acceltree/qacceltree_p.h +++ b/src/xmlpatterns/acceltree/qacceltree_p.h @@ -57,8 +57,8 @@ #include <QVector> #include <QXmlName> -#include "qitem_p.h" -#include "qnamepool_p.h" +#include <private/qitem_p.h> +#include <private/qnamepool_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h index 58c6781..977998d 100644 --- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h +++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h @@ -55,15 +55,15 @@ #include <QSet> #include <QStack> -#include "private/qxmlutils_p.h" -#include "qacceltree_p.h" -#include "qbuiltintypes_p.h" -#include "qcompressedwhitespace_p.h" -#include "qnamepool_p.h" -#include "qnodebuilder_p.h" -#include "qreportcontext_p.h" -#include "qsourcelocationreflection_p.h" -#include "qpatternistlocale_p.h" +#include <private/qxmlutils_p.h> +#include <private/qacceltree_p.h> +#include <private/qbuiltintypes_p.h> +#include <private/qcompressedwhitespace_p.h> +#include <private/qnamepool_p.h> +#include <private/qnodebuilder_p.h> +#include <private/qreportcontext_p.h> +#include <private/qsourcelocationreflection_p.h> +#include <private/qpatternistlocale_p.h> #include <QtDebug> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h index 6d04dea..f5bce24 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h @@ -55,13 +55,13 @@ #include <QtCore/QEventLoop> #include <QtNetwork/QNetworkReply> -#include "qabstractxmlreceiver.h" -#include "qacceltree_p.h" -#include "qacceltreebuilder_p.h" -#include "qdeviceresourceloader_p.h" -#include "qnamepool_p.h" -#include "qnetworkaccessdelegator_p.h" -#include "qreportcontext_p.h" +#include <QAbstractXmlReceiver> +#include <private/qacceltree_p.h> +#include <private/qacceltreebuilder_p.h> +#include <private/qdeviceresourceloader_p.h> +#include <private/qnamepool_p.h> +#include <private/qnetworkaccessdelegator_p.h> +#include <private/qreportcontext_p.h> QT_BEGIN_HEADER |