Commit 8fd21efb authored by spiiroin's avatar spiiroin

Merge branch 'jb43928_annotate_introspect_xml' into 'master'

Add Qt specific annotation to usb-moded D-Bus Introspect XML

See merge request !47
parents 1aa8a7cc ee7f6b99
...@@ -92,9 +92,11 @@ ...@@ -92,9 +92,11 @@
</signal> </signal>
<signal name="sig_usb_taget_mode_config_ind"> <signal name="sig_usb_taget_mode_config_ind">
<arg name="config" type="a{sv}"/> <arg name="config" type="a{sv}"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
</signal> </signal>
<method name="get_target_mode_config"> <method name="get_target_mode_config">
<arg name="config" type="a{sv}" direction="out"/> <arg name="config" type="a{sv}" direction="out"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
</signal> </signal>
</interface> </interface>
</node> </node>
...@@ -213,12 +213,14 @@ static const char umdbus_introspect_usbmoded[] = ...@@ -213,12 +213,14 @@ static const char umdbus_introspect_usbmoded[] =
" <signal name=\"" USB_MODE_WHITELISTED_MODES_SIGNAL_NAME "\">\n" " <signal name=\"" USB_MODE_WHITELISTED_MODES_SIGNAL_NAME "\">\n"
" <arg name=\"modes\" type=\"s\"/>\n" " <arg name=\"modes\" type=\"s\"/>\n"
" </signal>\n" " </signal>\n"
" <signal name=\"" USB_MODE_TARGET_CONFIG_SIGNAL_NAME "\">" " <signal name=\"" USB_MODE_TARGET_CONFIG_SIGNAL_NAME "\">\n"
" <arg name=\"config\" type=\"a{sv}\"/>" " <arg name=\"config\" type=\"a{sv}\"/>\n"
" </signal>" " <annotation name=\"org.qtproject.QtDBus.QtTypeName.In0\" value=\"QVariantMap\"/>\n"
" <method name=\"" USB_MODE_TARGET_CONFIG_GET "\">" " </signal>\n"
" <arg name=\"config\" type=\"a{sv}\" direction=\"out\"/>" " <method name=\"" USB_MODE_TARGET_CONFIG_GET "\">\n"
" </signal>" " <arg name=\"config\" type=\"a{sv}\" direction=\"out\"/>\n"
" <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"QVariantMap\"/>\n"
" </signal>\n"
" </interface>\n" " </interface>\n"
"</node>\n"; "</node>\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment