diff options
author | Liang Qi <liang.qi@qt.io> | 2019-03-15 19:04:30 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-03-15 19:04:30 +0000 |
commit | 8cc8eb8f24b9d297a25c9841326c6fa8561cf80e (patch) | |
tree | 9f9d05bb098dc65b8a36c5db59b451573e507cb9 /src/corelib/kernel | |
parent | 73a2e9c4098037aaa540b97ff097c660290622da (diff) | |
parent | 32084b073362e52df597cc388cf54f5173e20b0d (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 25e205b812..759ccaacd8 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2875,8 +2875,8 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho 0 may be used as a wildcard, meaning "any signal", "any receiving object", or "any slot in the receiving object", respectively. - The \a sender may never be 0. (You cannot disconnect signals from - more than one object in a single call.) + The \a sender may never be \nullptr. (You cannot disconnect signals + from more than one object in a single call.) If \a signal is 0, it disconnects \a receiver and \a method from any signal. If not, only the specified signal is disconnected. @@ -2887,8 +2887,8 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho If \a method is 0, it disconnects anything that is connected to \a receiver. If not, only slots named \a method will be disconnected, - and all other slots are left alone. The \a method must be 0 if \a - receiver is left out, so you cannot disconnect a + and all other slots are left alone. The \a method must be \nullptr + if \a receiver is left out, so you cannot disconnect a specifically-named slot on all objects. \sa connect() @@ -4913,8 +4913,8 @@ bool QObject::disconnect(const QMetaObject::Connection &connection) 0 may be used as a wildcard, meaning "any signal", "any receiving object", or "any slot in the receiving object", respectively. - The \a sender may never be 0. (You cannot disconnect signals from - more than one object in a single call.) + The \a sender may never be \nullptr. (You cannot disconnect signals + from more than one object in a single call.) If \a signal is 0, it disconnects \a receiver and \a method from any signal. If not, only the specified signal is disconnected. @@ -4925,8 +4925,8 @@ bool QObject::disconnect(const QMetaObject::Connection &connection) If \a method is 0, it disconnects anything that is connected to \a receiver. If not, only slots named \a method will be disconnected, - and all other slots are left alone. The \a method must be 0 if \a - receiver is left out, so you cannot disconnect a + and all other slots are left alone. The \a method must be \nullptr + if \a receiver is left out, so you cannot disconnect a specifically-named slot on all objects. \note It is not possible to use this overload to diconnect signals |