3 files changed, 6 insertions, 5 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 7b4135e1f8..ff6ba17612 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -82,9 +82,9 @@ Error Error::augment(const QString &contextErrorMessage) const
 QString diagnosticErrorMessage(const QString &fileName, const QQmlJS::DiagnosticMessage &m)
 {
     QString message;
-    message = fileName + QLatin1Char(':') + QString::number(m.loc.startLine) + QLatin1Char(':');
-    if (m.loc.startColumn > 0)
-        message += QString::number(m.loc.startColumn) + QLatin1Char(':');
+    message = fileName + QLatin1Char(':') + QString::number(m.line) + QLatin1Char(':');
+    if (m.column > 0)
+        message += QString::number(m.column) + QLatin1Char(':');
 
     if (m.isError())
         message += QLatin1String(" error: ");
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 57aeeee0a9..ee69a0ed42 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -32,6 +32,7 @@
 #include <private/qv4codegen_p.h>
 #include <private/qv4staticvalue_p.h>
 #include <private/qqmlirbuilder_p.h>
+#include <private/qqmljsdiagnosticmessage_p.h>
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
@@ -272,7 +273,7 @@ QVariantList findQmlImportsInQmlCode(const QString &filePath, const QString &cod
         const auto diagnosticMessages = parser.diagnosticMessages();
         for (const QQmlJS::DiagnosticMessage &m : diagnosticMessages) {
             std::cerr << QDir::toNativeSeparators(filePath).toStdString() << ':'
-                      << m.loc.startLine << ':' << m.message.toStdString() << std::endl;
+                      << m.line << ':' << m.message.toStdString() << std::endl;
         }
         return QVariantList();
     }
diff --git a/tools/qmllint/main.cpp b/tools/qmllint/main.cpp
index 0fdc3e0130..bf0ceb54b7 100644
--- a/tools/qmllint/main.cpp
+++ b/tools/qmllint/main.cpp
@@ -63,7 +63,7 @@ static bool lint_file(const QString &filename, bool silent)
     if (!success && !silent) {
         const auto diagnosticMessages = parser.diagnosticMessages();
         for (const QQmlJS::DiagnosticMessage &m : diagnosticMessages) {
-            qWarning("%s:%d : %s", qPrintable(filename), m.loc.startLine, qPrintable(m.message));
+            qWarning("%s:%d : %s", qPrintable(filename), m.line, qPrintable(m.message));
         }
     }