diff options
Diffstat (limited to 'src/declarative/qml/parser')
-rw-r--r-- | src/declarative/qml/parser/qmljsast.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/parser/qmljsglobal_p.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp index 11a98b6..64fe99c 100644 --- a/src/declarative/qml/parser/qmljsast.cpp +++ b/src/declarative/qml/parser/qmljsast.cpp @@ -42,7 +42,7 @@ #include "qmljsast_p.h" #include "qmljsastvisitor_p.h" -QT_BEGIN_NAMESPACE +QT_QML_BEGIN_NAMESPACE namespace QmlJS { namespace AST { @@ -940,6 +940,6 @@ void UiSourceElement::accept0(Visitor *visitor) } } // namespace QmlJS::AST -QT_END_NAMESPACE +QT_QML_END_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsglobal_p.h b/src/declarative/qml/parser/qmljsglobal_p.h index 675c67b..99bb19f 100644 --- a/src/declarative/qml/parser/qmljsglobal_p.h +++ b/src/declarative/qml/parser/qmljsglobal_p.h @@ -3,12 +3,12 @@ #include <QtCore/qglobal.h> -#ifndef QT_CREATOR -#define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE -#define QT_QML_END_NAMESPACE QT_END_NAMESPACE -#else // !QT_CREATOR +#ifdef QT_CREATOR #define QT_QML_BEGIN_NAMESPACE #define QT_QML_END_NAMESPACE +#else // !QT_CREATOR +#define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE +#define QT_QML_END_NAMESPACE QT_END_NAMESPACE #endif // QT_CREATOR #endif // QMLJSGLOBAL_P_H |