diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-09-23 18:42:50 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-09-27 13:46:58 (GMT) |
| commit | 06af1253c214e893a4754cd10f8a17dc535c34a4 (patch) | |
| tree | cad376b22a24ef34089a04d2369717ddc8c7a6f7 /src/corelib/kernel | |
| parent | 140e68ae50411631aa5c1649face4c7d9d1b651d (diff) | |
| download | Qt-06af1253c214e893a4754cd10f8a17dc535c34a4.zip Qt-06af1253c214e893a4754cd10f8a17dc535c34a4.tar.gz Qt-06af1253c214e893a4754cd10f8a17dc535c34a4.tar.bz2 | |
Use the right callback in QObject::disconnect()
Change-Id: Idf2f725dd859aa5c960e5889678cac0e139e44b0
Reviewed-on: http://codereview.qt-project.org/5475
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit d5ad900c77af563a1f3cfb0d252fd173249493fb)
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 67dbadb..5d6e4d7 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3002,7 +3002,7 @@ bool QObject::disconnect(const QObject *sender, const QMetaMethod &signal, } const void *cbdata[] = { sender, signal.mobj ? signalSignature.constData() : 0, receiver, method.mobj ? methodSignature.constData() : 0 }; - if (QInternal::activateCallbacks(QInternal::ConnectCallback, (void **) cbdata)) + if (QInternal::activateCallbacks(QInternal::DisconnectCallback, (void **) cbdata)) return true; } |