diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2013-08-07 18:15:43 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-08 07:22:31 (GMT) |
| commit | b3116abe3ab3b8a233cfa2ebea06fdc3dd5d72d8 (patch) | |
| tree | 226bb98686869bd2e846cf3cd916dfc6e7e4f0b9 /src/dbus | |
| parent | 9deca2ef28e1f593d3882ba0c7e9dd7b04aac993 (diff) | |
| download | Qt-b3116abe3ab3b8a233cfa2ebea06fdc3dd5d72d8.zip Qt-b3116abe3ab3b8a233cfa2ebea06fdc3dd5d72d8.tar.gz Qt-b3116abe3ab3b8a233cfa2ebea06fdc3dd5d72d8.tar.bz2 | |
Revert ea6ec4c781d5e94425b70f9f4e45d3e50eb12299
It has been discovered it changes the behavior of qdbuscpp2xml
resulting in builds of some apps breaking. Even if the
behavior is more correct, such behavior change in a stable branch is
not acceptable
Change-Id: I94826b06861188455779ee22218685951f0f8d6b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusxmlgenerator.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 6cc924a..275d268 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -211,13 +211,12 @@ 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 - : isSlot ? QDBusConnection::ExportScriptableSlots : QDBusConnection::ExportScriptableInvokables; + : QDBusConnection::ExportScriptableSlots; else wantedMask = isSignal ? QDBusConnection::ExportNonScriptableSignals - : isSlot ? QDBusConnection::ExportNonScriptableSlots : QDBusConnection::ExportNonScriptableInvokables; + : QDBusConnection::ExportNonScriptableSlots; if ((flags & wantedMask) != wantedMask) continue; |