From ee7f6b99f884814b1058bbcfcb51b8c93110a617 Mon Sep 17 00:00:00 2001
From: Simo Piiroinen <simo.piiroinen@jollamobile.com>
Date: Fri, 8 Mar 2019 09:50:06 +0200
Subject: [PATCH] [dbus] Add Qt specific annotation to usb-moded Introspect XML

Attempting to generate code from usb-moded introspect data with
qdbusxml2cpp fails because "a{sv}" is by design mystery to it.

Add annotation to tell qdbusxml2cpp that "a{sv}" is QVariantMap.

And add couple of missing "\n" chars while at it.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
---
 src/com.meego.usb_moded.xml |  2 ++
 src/usb_moded-dbus.c        | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/com.meego.usb_moded.xml b/src/com.meego.usb_moded.xml
index 3a3b5fc..32d04e4 100644
--- a/src/com.meego.usb_moded.xml
+++ b/src/com.meego.usb_moded.xml
@@ -92,9 +92,11 @@
     </signal>
     <signal name="sig_usb_taget_mode_config_ind">
       <arg name="config" type="a{sv}"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
     </signal>
     <method name="get_target_mode_config">
       <arg name="config" type="a{sv}" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
     </signal>
   </interface>
 </node>
diff --git a/src/usb_moded-dbus.c b/src/usb_moded-dbus.c
index 2bf66ba..d8c6d1a 100644
--- a/src/usb_moded-dbus.c
+++ b/src/usb_moded-dbus.c
@@ -213,12 +213,14 @@ static const char umdbus_introspect_usbmoded[] =
 "    <signal name=\"" USB_MODE_WHITELISTED_MODES_SIGNAL_NAME "\">\n"
 "      <arg name=\"modes\" type=\"s\"/>\n"
 "    </signal>\n"
-"    <signal name=\"" USB_MODE_TARGET_CONFIG_SIGNAL_NAME "\">"
-"      <arg name=\"config\" type=\"a{sv}\"/>"
-"    </signal>"
-"    <method name=\"" USB_MODE_TARGET_CONFIG_GET "\">"
-"      <arg name=\"config\" type=\"a{sv}\" direction=\"out\"/>"
-"    </signal>"
+"    <signal name=\"" USB_MODE_TARGET_CONFIG_SIGNAL_NAME "\">\n"
+"      <arg name=\"config\" type=\"a{sv}\"/>\n"
+"      <annotation name=\"org.qtproject.QtDBus.QtTypeName.In0\" value=\"QVariantMap\"/>\n"
+"    </signal>\n"
+"    <method name=\"" USB_MODE_TARGET_CONFIG_GET "\">\n"
+"      <arg name=\"config\" type=\"a{sv}\" direction=\"out\"/>\n"
+"      <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"QVariantMap\"/>\n"
+"    </signal>\n"
 "  </interface>\n"
 "</node>\n";