diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2013-11-21 18:37:36 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-26 08:29:41 +0100 |
commit | 9b8570c4e9359eb8b45b39c28aa9d8c140f3fc44 (patch) | |
tree | 5396042f50911706a042c9e71458a7cd6877267f /bin | |
parent | df449d4f86b152ff471e6fa4cc11182fa409bc0d (diff) |
Fix deadlock when disconnecting connections made with function pointersv5.2.0-rc1
The regression was introduced in 5885b8f775998c30d53f40b7f368c5f6364e6df4
QMetaObjectPrivate::disconnectHelper may unlock the sender mutex. And
while relocking it, we need to make sure to lock the sender and receiver
mutex in the right order. So don't lock the receiver mutex in advance, but
re-lock it for each connection.
Change-Id: I4f6d19791cdcce3693d7f45e7beb6b564fd69277
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions