diff --git a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h
index a29d29e642e..72ed3f83c68 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 58613159d37..512a545b131 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 4027c7a073d..b71d777dae0 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);
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index a82792b1e8b..b7426c7a43c 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -773,7 +773,7 @@ void TextToModelMerger::setupImports(const Document::Ptr &doc,
 
         QString version;
         if (import->version != nullptr)
-            version = QLatin1String("%1.%2").arg(import->version->majorVersion).arg(import->version->minorVersion);
+            version = QString("%1.%2").arg(import->version->majorVersion).arg(import->version->minorVersion);
         const QString &as = import->importId.toString();
 
         if (!import->fileName.isEmpty()) {
diff --git a/tests/auto/qml/codemodel/check/tst_check.cpp b/tests/auto/qml/codemodel/check/tst_check.cpp
index 0c3ba465fc6..8a52fd0ced4 100644
--- a/tests/auto/qml/codemodel/check/tst_check.cpp
+++ b/tests/auto/qml/codemodel/check/tst_check.cpp
@@ -134,7 +134,7 @@ void tst_Check::test()
     const QRegExp messagePattern(" (\\d+) (\\d+) (\\d+)");
 
     QList<Message> expectedMessages;
-    foreach (const AST::SourceLocation &comment, doc->engine()->comments()) {
+    foreach (const SourceLocation &comment, doc->engine()->comments()) {
         const QString text = doc->source().mid(comment.begin(), comment.end() - comment.begin());
 
         if (messagePattern.indexIn(text) == -1)
diff --git a/tests/tools/qml-ast2dot/main.cpp b/tests/tools/qml-ast2dot/main.cpp
index 98875b81a6e..6ffd8c11b37 100644
--- a/tests/tools/qml-ast2dot/main.cpp
+++ b/tests/tools/qml-ast2dot/main.cpp
@@ -154,7 +154,7 @@ protected: // visiting functions:
         else
             terminal(ast->fileNameToken);
 
-        terminal(ast->versionToken);
+        terminal(ast->version->firstSourceLocation());
         terminal(ast->asToken);
         terminal(ast->importIdToken);
         terminal(ast->semicolonToken);
@@ -299,6 +299,9 @@ protected: // visiting functions:
     virtual bool visit(DebuggerStatement *ast) { terminal(ast->debuggerToken); terminal(ast->semicolonToken); return false; }
     virtual bool visit(UiParameterList *ast) { terminal(ast->commaToken); terminal(ast->identifierToken); nonterminal(ast->next); return false; }
 
+    void throwRecursionDepthError() override {
+        qWarning() << "Reached maximum recursion depth.";
+    }
 private:
     QHash<Node *, QByteArray> _id;
     QList<QPair<QByteArray, QByteArray> > _connections;