Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I2963c1209316fb6755f572969f368970450d7991

1 files changed, 13 insertions, 3 deletions

diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
index 3643ca65c6..1e690e38dd 100644
--- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
+++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
@@ -32,6 +32,7 @@
 #include <QObject>
 #include <QQmlEngine>
 #include <QQmlComponent>
+#include <private/qqmljsdiagnosticmessage_p.h>
 #include <private/qqmldirparser_p.h>
 #include <QDebug>
 
@@ -56,12 +57,21 @@ tst_qqmldirparser::tst_qqmldirparser()
 
 namespace {
 
-    QStringList toStringList(const QList<QQmlError> &errors)
+    QStringList toStringList(const QList<QQmlJS::DiagnosticMessage> &errors)
     {
         QStringList rv;
 
-        foreach (const QQmlError &e, errors)
-            rv.append(e.toString());
+        for (const QQmlJS::DiagnosticMessage &e : errors)  {
+            QString errorString = QLatin1String("qmldir");
+            if (e.line > 0) {
+                errorString += QLatin1Char(':') + QString::number(e.line);
+                if (e.column > 0)
+                    errorString += QLatin1Char(':') + QString::number(e.column);
+            }
+
+            errorString += QLatin1String(": ") + e.message;
+            rv.append(errorString);
+        }
 
         return rv;
     }