diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-07 09:13:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-04-07 08:48:07 +0000 |
| commit | 5199cce73762771f593f12abbe326f8086142c0e (patch) | |
| tree | 055b1157fe6570370c313b38c43053f2e01aa817 /src | |
| parent | a0fdb626e5779e0f393fb9d031bc44d5f48de263 (diff) | |
| download | qtxmlpatterns-5199cce73762771f593f12abbe326f8086142c0e.tar.gz | |
Rename private header qdebug_p.h to qxmldebug_p.h.
Avoid conflicts with the newly introduced qdebug_p.h
of QtCore.
Change-Id: I04b83e159900d9d36fa96ae5112eb4cdf75c0551
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmlpatterns/acceltree/qacceltree.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qsourcelocation.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/expr/qexpression_p.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/expr/qexpressionfactory.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/parser/qquerytransformparser.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/utils/qxmldebug_p.h (renamed from src/xmlpatterns/utils/qdebug_p.h) | 0 | ||||
| -rw-r--r-- | src/xmlpatterns/utils/utils.pri | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/src/xmlpatterns/acceltree/qacceltree.cpp b/src/xmlpatterns/acceltree/qacceltree.cpp index 9c26c25..fca6b26 100644 --- a/src/xmlpatterns/acceltree/qacceltree.cpp +++ b/src/xmlpatterns/acceltree/qacceltree.cpp @@ -40,7 +40,7 @@ #include "qatomicstring_p.h" #include "qcommonvalues_p.h" #include "qcompressedwhitespace_p.h" -#include "qdebug_p.h" +#include "qxmldebug_p.h" #include "quntypedatomic_p.h" #include "qxpathhelper_p.h" diff --git a/src/xmlpatterns/api/qsourcelocation.cpp b/src/xmlpatterns/api/qsourcelocation.cpp index 988569e..1861409 100644 --- a/src/xmlpatterns/api/qsourcelocation.cpp +++ b/src/xmlpatterns/api/qsourcelocation.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include "qdebug_p.h" +#include "qxmldebug_p.h" #include "qsourcelocation.h" diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h index e30d04b..c799725 100644 --- a/src/xmlpatterns/expr/qexpression_p.h +++ b/src/xmlpatterns/expr/qexpression_p.h @@ -48,7 +48,7 @@ #include <QSharedData> #include <private/qcppcastinghelper_p.h> -#include <private/qdebug_p.h> +#include <private/qxmldebug_p.h> #include <private/qdynamiccontext_p.h> #include <private/qexpressiondispatch_p.h> #include <private/qitem_p.h> diff --git a/src/xmlpatterns/expr/qexpressionfactory.cpp b/src/xmlpatterns/expr/qexpressionfactory.cpp index 2c9c51a..2afa2cc 100644 --- a/src/xmlpatterns/expr/qexpressionfactory.cpp +++ b/src/xmlpatterns/expr/qexpressionfactory.cpp @@ -36,7 +36,7 @@ #include "qcalltemplate_p.h" #include "qcommonsequencetypes_p.h" -#include "qdebug_p.h" +#include "qxmldebug_p.h" #include "qexpression_p.h" #include "qgenericstaticcontext_p.h" #include "qoperandsiterator_p.h" diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp index df612ad..0ef0c45 100644 --- a/src/xmlpatterns/parser/qquerytransformparser.cpp +++ b/src/xmlpatterns/parser/qquerytransformparser.cpp @@ -189,7 +189,7 @@ #include <private/qcontextitem_p.h> #include <private/qcopyof_p.h> #include <private/qcurrentitemstore_p.h> -#include <private/qdebug_p.h> +#include <private/qxmldebug_p.h> #include <private/qdelegatingnamespaceresolver_p.h> #include <private/qdocumentconstructor_p.h> #include <private/qelementconstructor_p.h> diff --git a/src/xmlpatterns/utils/qdebug_p.h b/src/xmlpatterns/utils/qxmldebug_p.h index f70b3ad..f70b3ad 100644 --- a/src/xmlpatterns/utils/qdebug_p.h +++ b/src/xmlpatterns/utils/qxmldebug_p.h diff --git a/src/xmlpatterns/utils/utils.pri b/src/xmlpatterns/utils/utils.pri index 2db91c2..97da7e8 100644 --- a/src/xmlpatterns/utils/utils.pri +++ b/src/xmlpatterns/utils/utils.pri @@ -1,7 +1,7 @@ HEADERS += $$PWD/qautoptr_p.h \ $$PWD/qcommonnamespaces_p.h \ $$PWD/qcppcastinghelper_p.h \ - $$PWD/qdebug_p.h \ + $$PWD/qxmldebug_p.h \ $$PWD/qgenericnamespaceresolver_p.h \ $$PWD/qpatternistlocale_p.h \ $$PWD/qnamepool_p.h \ |