Fix QObject::receivers() within connectNotify()

The receiver count needs to be correct in connectNotify() to be
compatible with ordinary connections.
Fix this and add test.

Change-Id: Icff0486dac49876b8c5d8836a85cff9284368a52
Reviewed-by: Alan Alpert <416365416c@gmail.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h
index 4bf8015a49..e3c2271ac7 100644
--- a/src/qml/qml/qqmlnotifier_p.h
+++ b/src/qml/qml/qqmlnotifier_p.h
@@ -189,13 +189,17 @@ void QQmlNotifierEndpoint::connect(QQmlNotifier *notifier)
 
 void QQmlNotifierEndpoint::disconnect()
 {
+    // Remove from notifier chain before calling disconnectNotify(), so that that
+    // QObject::receivers() returns the correct value in there
+    if (next) next->prev = prev;
+    if (prev) *prev = next;
+
     if (sourceSignal != -1) {
         QObject * const obj = senderAsObject();
         QObjectPrivate * const priv = QObjectPrivate::get(obj);
         priv->disconnectNotify(QMetaObjectPrivate::signal(obj->metaObject(), sourceSignal));
     }
-    if (next) next->prev = prev;
-    if (prev) *prev = next;
+
     if (isNotifying()) *((intptr_t *)(senderPtr & ~0x1)) = 0;
     next = 0;
     prev = 0;