Document that disconnectNotify may be called with a mutex locked

And that connectNotify and disconnectNotify might be called from
another thread

Task-number: QTBUG-34829

Change-Id: Id118b97b92e9aa085a1d4368282294f90cfb1706
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
This commit is contained in:
Olivier Goffart 2013-11-21 10:08:45 +01:00 committed by The Qt Project
parent 7529d38d83
commit de816219ee

View File

@ -2996,6 +2996,10 @@ bool QObject::disconnect(const QObject *sender, const QMetaMethod &signal,
expensive initialization only if something is connected to a expensive initialization only if something is connected to a
signal. signal.
\warning This function is called from the thread which performs the
connection, which may be a different thread from the thread in
which this object lives.
\sa connect(), disconnectNotify() \sa connect(), disconnectNotify()
*/ */
@ -3022,6 +3026,15 @@ void QObject::connectNotify(const QMetaMethod &signal)
modularity. However, it might be useful for optimizing access to modularity. However, it might be useful for optimizing access to
expensive resources. expensive resources.
\warning This function is called from the thread which performs the
disconnection, which may be a different thread from the thread in
which this object lives. This function may also be called with a QObject
internal mutex locked. It is therefore not allowed to re-enter any
of any QObject functions from your reimplementation and if you lock
a mutex in your reimplementation, make sure that you don't call QObject
functions with that mutex held in other places or it will result in
a deadlock.
\sa disconnect(), connectNotify() \sa disconnect(), connectNotify()
*/ */