diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-23 14:57:09 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-06-14 19:08:51 +0200 |
commit | d4d197d06279f9257647628f7e1ccc9ec763a6bb (patch) | |
tree | fb2a69b85cb1d7aee173267062421058d5e9d57c /tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp | |
parent | 67191c2b3213259c6eaf045154e9370faa085868 (diff) |
Simplify errors and diagnostics
We only need two classes to describe all possible diagnostics:
* A low-level private POD DiagnosticMessage. This is easily copied and
passed around internally. It doesn't need to adhere to a stable API
and it doesn't carry any extra baggage.
* The high-level public QQmlError with its stable interface. This can
internally also use a DiagnosticMessage as storage.
Change-Id: I52be88d9b5d9855a661b8032b01eedb43a0fb0b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp')
-rw-r--r-- | tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp | 16 |
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; } |