summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@kde.org>2011-09-23 20:42:50 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-23 20:46:03 +0200
commitd5ad900c77af563a1f3cfb0d252fd173249493fb (patch)
tree960aacc2315036081a251b5e3c6358ed9329b0a7
parent978671c47574edaf8c28369610937e964860e1a7 (diff)
Use the right callback in QObject::disconnect()
Change-Id: Idf2f725dd859aa5c960e5889678cac0e139e44b0 Reviewed-on: http://codereview.qt-project.org/5475 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--src/corelib/kernel/qobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 0f314d45f1..0d7b840c3e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2826,7 +2826,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;
}