SignalSpy: manually disconnect from target signal when we're destroyed

The SignalSpy is potentially destroyed before the target object, and since only the sender (target) being destroyed destroys a connection in QML, and not the receiver (SignalSpy), we need to manually disconnect. When QTBUG-118166 is implemented, we can remove this. Task-number: QTBUG-118163 Pick-to: 6.5 6.2 Change-Id: I76aaffba114a6db5b5aab6a2ff58541aa3b2e025 Reviewed-by: Fabian Kosmale <[email protected]> (cherry picked from commit fd7459a) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
qt · Nov 11, 2023 · 70ac456 · 70ac456
1 parent 5f860b7
commit 70ac456
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/qmltest/SignalSpy.qml b/src/qmltest/SignalSpy.qml
@@ -45,6 +45,16 @@ Item {
     id: spy
     visible: false
 
+    Component.onDestruction: {
+        // We are potentially destroyed before the target object,
+        // and since only the sender (target) being destroyed destroys a connection
+        // in QML, and not the receiver (us/"spy"), we need to manually disconnect.
+        // When QTBUG-118166 is implemented, we can remove this.
+        let signalFunc = target ? target[signalName] : null
+        if (signalFunc)
+            signalFunc.disconnect(spy.qtest_activated)
+    }
+
     TestUtil {
         id: util
     }