From a82f707ee5a1590385c11064b0bf8f720830399e Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 4 Mar 2020 10:41:59 +0100
Subject: [PATCH] QmlJS: Fix up compile fix

Amends 33b091bd40187449a3e925659ae0738786e09de3.

Change-Id: I26d98bae8a074f7c3515b46994afd5548e2ca82f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h | 4 ++--
 src/libs/qmljs/parser/qmljslexer.cpp             | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

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 <QtCore/qdebug.h>
 #include <QtCore/QScopedValueRollback>
 
-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)