diff options
author | Albert Astals Cid <albert.astals@canonical.com> | 2013-08-07 20:19:09 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-08 09:22:29 +0200 |
commit | 23214c815ec267e999015a971768dbf8f6ea0957 (patch) | |
tree | 7190276476fda2c7e745d9a8396dd223a5909d0b /src/dbus | |
parent | 737abb8a5e51d75c0f2f93d5f7b42b05400034a9 (diff) |
Revert c3f485c5250a503832e767e1fe5e40595126f6c5
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: I1d79104ebf11c3f48c84f109be2926af96cddae7
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 bf5e24cd5f..8c822162e4 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -209,13 +209,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; |