diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2015-03-12 16:25:56 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals@canonical.com> | 2015-03-13 08:15:10 +0000 |
| commit | baa3a71e323f30da29f6a1cfa79a556fd5f24935 (patch) | |
| tree | c94503e9dcfc92e1fb8ed500b04fee603d5b41c1 /src/dbus | |
| parent | 3f8e3373e1b7fd34d4223b8853587273ae6beb34 (diff) | |
Revert adding dispatchLocker to QDBusConnection::connect
This reverts 268cc1dc996ba943895f24c5ca915c2b406b6097
On further examination it has shown that even if it fixes one deadlock
it is either creating some others or making existing ones happen more often
Change-Id: I70068cf0b0435a5dc06d4ac77ea50d3ba2361d01
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index f574b299cd..a46df16ac5 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -700,7 +700,6 @@ bool QDBusConnection::connect(const QString &service, const QString &path, const return false; } - QDBusDispatchLocker dispatchLocker(ConnectAction, d); QDBusWriteLocker locker(ConnectAction, d); return d->connectSignal(service, path, interface, name, argumentMatch, signature, receiver, slot); } |