QmlJS: Fix compile

..in general, with tests, and when using a namespaced Qt.
Amends b09a48599e7.

Change-Id: I99e275e10df5eed741d021911a360457f0d0d2e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

3 files changed, 9 insertions, 5 deletions

diff --git a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h
index a29d29e642..72ed3f83c6 100644
--- a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h
+++ b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h
@@ -47,7 +47,7 @@
 
 #include "qmljssourcelocation_p.h"
 
-QT_BEGIN_NAMESPACE
+QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
 class DiagnosticMessage
@@ -93,7 +93,8 @@ public:
 };
 } // namespace QmlJS
 
+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 58613159d3..512a545b13 100644
--- a/src/libs/qmljs/parser/qmljslexer.cpp
+++ b/src/libs/qmljs/parser/qmljslexer.cpp
@@ -36,8 +36,9 @@
 #include <QtCore/QScopedValueRollback>
 
 QT_QML_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
-QT_QML_END_NAMESPACE
+QT_END_NAMESPACE
 
 using namespace QmlJS;
 
@@ -1619,3 +1620,5 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
 
     return true;
 }
+
+QT_QML_END_NAMESPACE
diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index 4027c7a073..b71d777dae 100644
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/src/libs/qmljs/qmljsreformatter.cpp
@@ -587,9 +587,9 @@ protected:
             accept(ast->importUri);
         if (ast->version) {
             out(" ");
-            out(QString::number(ast->version->majorVersion).toUtf8());
+            out(QString::number(ast->version->majorVersion));
             out(".");
-            out(QString::number(ast->version->minorVersion).toUtf8());
+            out(QString::number(ast->version->minorVersion));
         }
         if (!ast->importId.isNull()) {
             out(" as ", ast->asToken);