diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-09 01:00:06 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-09 10:54:36 +0100 |
commit | f65c0e7190c4f2ebcadc963cf0647c71de26f3bb (patch) | |
tree | 9e6525274d9aa01d4fff9e059dc5b428cbf2f447 /src/qml/common/qqmljsdiagnosticmessage_p.h | |
parent | 433f5be47b8245e955bad5a4d3cfcc38354ce62a (diff) | |
parent | d51d5ff3c187821929cf7b765e037423bcc90466 (diff) |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/qml/common/qqmljsdiagnosticmessage_p.h')
-rw-r--r-- | src/qml/common/qqmljsdiagnosticmessage_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/common/qqmljsdiagnosticmessage_p.h b/src/qml/common/qqmljsdiagnosticmessage_p.h index 763332ba76..9f5380ae0c 100644 --- a/src/qml/common/qqmljsdiagnosticmessage_p.h +++ b/src/qml/common/qqmljsdiagnosticmessage_p.h @@ -58,6 +58,8 @@ // QQmlSourceLocation -> line/column change. #include <private/qqmlapiversion_p.h> +#include "qqmljssourcelocation_p.h" + QT_BEGIN_NAMESPACE namespace QQmlJS { @@ -65,8 +67,7 @@ struct DiagnosticMessage { QString message; QtMsgType type = QtCriticalMsg; - quint32 line = 0; - quint32 column = 0; + SourceLocation loc; bool isError() const { |