diff options
author | Albert Astals Cid <albert.astals@canonical.com> | 2013-07-25 17:06:16 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-30 20:34:11 +0200 |
commit | c3f485c5250a503832e767e1fe5e40595126f6c5 (patch) | |
tree | 8af3e0b9e047a0903bf471594c8ee95a50669e9c /src/dbus | |
parent | 8fd3d53a93d50506a0c3fa620e560cf1b03ba3c0 (diff) |
Expose invokables that are not slots in the xml
Without it the invocations were working but were not listed on introspection
Change-Id: Ie62f7dc3577f52b6888ddebf0392fdf51f2845d5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusxmlgenerator.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 8c822162e4..bf5e24cd5f 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -209,12 +209,13 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method } int wantedMask; + const bool isSlot = mm.methodType() == QMetaMethod::Slot; if (isScriptable) wantedMask = isSignal ? QDBusConnection::ExportScriptableSignals - : QDBusConnection::ExportScriptableSlots; + : isSlot ? QDBusConnection::ExportScriptableSlots : QDBusConnection::ExportScriptableInvokables; else wantedMask = isSignal ? QDBusConnection::ExportNonScriptableSignals - : QDBusConnection::ExportNonScriptableSlots; + : isSlot ? QDBusConnection::ExportNonScriptableSlots : QDBusConnection::ExportNonScriptableInvokables; if ((flags & wantedMask) != wantedMask) continue; |