diff --git a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h index 72ed3f83c68..e3c2cf56e8f 100644 --- a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h +++ b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h @@ -93,8 +93,8 @@ public: }; } // namespace QmlJS +QT_QML_END_NAMESPACE + QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(QmlJS::DiagnosticMessage, Q_MOVABLE_TYPE); QT_END_NAMESPACE - -QT_QML_END_NAMESPACE diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index 512a545b131..ec8bf60a2a7 100644 --- a/src/libs/qmljs/parser/qmljslexer.cpp +++ b/src/libs/qmljs/parser/qmljslexer.cpp @@ -35,11 +35,12 @@ #include #include -QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); QT_END_NAMESPACE +QT_QML_BEGIN_NAMESPACE + using namespace QmlJS; static inline int regExpFlagFromChar(const QChar &ch)