Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb43928_annotate_introspect_xml' into 'master'
Add Qt specific annotation to usb-moded D-Bus Introspect XML

See merge request mer-core/usb-moded!47
  • Loading branch information
spiiroin committed Mar 8, 2019
2 parents 1aa8a7c + ee7f6b9 commit 8fd21ef
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 2 additions & 0 deletions src/com.meego.usb_moded.xml
Expand Up @@ -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>
14 changes: 8 additions & 6 deletions src/usb_moded-dbus.c
Expand Up @@ -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";

Expand Down

0 comments on commit 8fd21ef

Please sign in to comment.