diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2013-07-31 08:37:37 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-31 15:04:35 (GMT) |
| commit | ea6ec4c781d5e94425b70f9f4e45d3e50eb12299 (patch) | |
| tree | 629ffa913f38478fbd51854a6f22250717defc9d /src/dbus | |
| parent | ceedbadb516a5b5d86d4ec2802388c802e4d9a19 (diff) | |
| download | Qt-ea6ec4c781d5e94425b70f9f4e45d3e50eb12299.zip Qt-ea6ec4c781d5e94425b70f9f4e45d3e50eb12299.tar.gz Qt-ea6ec4c781d5e94425b70f9f4e45d3e50eb12299.tar.bz2 | |
Expose invokables that are not slots in the xml
Without it the invocations were working but were not listed on introspection
Backported from Qt5: qtbase commit c3f485c5250a503832e767e1fe5e40595126f6c5
Change-Id: Ie62f7dc3577f52b6888ddebf0392fdf51f2845a5
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 275d268..6cc924a 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -211,12 +211,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; |