path: root/src/corelib/kernel/qobjectdefs.h
diff options
authorThiago Macieira <>2015-05-19 11:49:37 -0700
committerThiago Macieira <>2015-06-19 23:22:33 +0000
commitb2be272d354defaebd82dfaa2dffefa5a8f3a303 (patch)
treec4b044e60b8c4ac975feefb8143bbefac47fbbb1 /src/corelib/kernel/qobjectdefs.h
parent54589f293297f0c132a7814a14f0d6ab38393b19 (diff)
Make QMetaObject::Connection check its state deeply
Since Connection can be copied, one copy could be used for disconnecting, but the other's d_ptr wouldn't get updated and would continue to report as still connected. This patch fixes that by making it check the internal state. That is only done after d_ptr is already known to be non-null. Unfortunately, that is the common path: if (connect(sender, &Sender::signal, [] {})) will call an out-of-line function. I don't see a way out. Task-number: QTBUG-46213 Change-Id: I66a35ce5f88941f29aa6ffff13dfb45dca68a350 Reviewed-by: Olivier Goffart (Woboq GmbH) <>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index 4d01264906..6484507a12 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -472,6 +472,7 @@ class Q_CORE_EXPORT QMetaObject::Connection {
friend class QObject;
friend class QObjectPrivate;
friend struct QMetaObject;
+ bool isConnected_helper() const;
@@ -481,7 +482,7 @@ public:
operator bool() const;
typedef void *Connection::*RestrictedBool;
- operator RestrictedBool() const { return d_ptr ? &Connection::d_ptr : 0; }
+ operator RestrictedBool() const { return d_ptr && isConnected_helper() ? &Connection::d_ptr : 0; }