diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-01-09 19:12:46 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-03-29 13:46:17 +0000 |
| commit | 6e0b5dadc7e91be786411809f1f9667c239168e2 (patch) | |
| tree | 4c8efa67ad7b5ebcd3536ee16af07eed697b0d57 /src/corelib/kernel/qmetaobject_p.h | |
| parent | a2fda801cc2e3558d8bcf7a002df6a824f9509fa (diff) | |
Change cleanup mechanism for orphaned connections
Put all connections that get disconnected into a singly
linked orphaned list.
Whenever the refcount on the connectionData drops down to
one, this list can safely be cleared, even with the planned
removal of locking in activate().
Use an id integer in the connection to acoid activating newly
added connections.
Fixes: QTBUG-72649
Change-Id: Ide3d116ae7fc9ca497598c1c2b71d43b4339c92d
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qmetaobject_p.h')
| -rw-r--r-- | src/corelib/kernel/qmetaobject_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 26d86fdf14..0cd9da2eac 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -232,7 +232,7 @@ struct QMetaObjectPrivate const QMetaObject *smeta, const QObject *receiver, int method_index, void **slot, DisconnectType = DisconnectAll); - static inline bool disconnectHelper(QObjectPrivate::Connection *c, + static inline bool disconnectHelper(QObjectPrivate::ConnectionData *connections, int signalIndex, const QObject *receiver, int method_index, void **slot, QBasicMutex *senderMutex, DisconnectType = DisconnectAll); #endif |