From 268cc1dc996ba943895f24c5ca915c2b406b6097 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <albert.astals@canonical.com>
Date: Fri, 6 Mar 2015 16:53:03 +0100
Subject: Lock dispatchLock before the regular lock

Fixes deadlock

Task-number: QTBUG-44836
Change-Id: Ie6def2d1e9684f4272d8920cd19c5765eef5f7c9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/dbus/qdbusconnection.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index a46df16ac5..f574b299cd 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -700,6 +700,7 @@ 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);
 }
-- 
cgit v1.2.3