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/xmlpatterns/expr | |
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/xmlpatterns/expr')
-rw-r--r-- | src/xmlpatterns/expr/qexpression_p.h | 2 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qexpressionfactory.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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" |