QDBusIntrospection: Add source location fields

Add source location to the introspection structs so
that errors and warning produced by qdbusxml2cpp can
be related to the source location.

Task-number: QTBUG-2597
Change-Id: I9a6ada45f9c0357dbfb846f13789c5f261e59d55
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h
index 0dd7f70579..b16fc4924a 100644
--- a/src/dbus/qdbusintrospection_p.h
+++ b/src/dbus/qdbusintrospection_p.h
@@ -51,8 +51,16 @@ public:
 public:
     // the structs
 
+    // Line and column numbers have the same meaning as in QXmlStreamReader.
+    struct SourceLocation
+    {
+        qint64 lineNumber = 1;
+        qint64 columnNumber = 0;
+    };
+
     struct Argument
     {
+        SourceLocation location;
         QString type;
         QString name;
 
@@ -62,6 +70,7 @@ public:
 
     struct Method
     {
+        SourceLocation location;
         QString name;
         Arguments inputArgs;
         Arguments outputArgs;
@@ -74,6 +83,7 @@ public:
 
     struct Signal
     {
+        SourceLocation location;
         QString name;
         Arguments outputArgs;
         Annotations annotations;
@@ -86,6 +96,7 @@ public:
     struct Property
     {
         enum Access { Read, Write, ReadWrite };
+        SourceLocation location;
         QString name;
         QString type;
         Access access;
@@ -98,6 +109,7 @@ public:
 
     struct Interface: public QSharedData
     {
+        SourceLocation location;
         QString name;
         QString introspection;
 
@@ -112,6 +124,7 @@ public:
 
     struct Object: public QSharedData
     {
+        SourceLocation location;
         QString service;
         QString path;