From: Charles Yin <yinyunqiao@gmail.com>
Date: Wed, 7 Mar 2012 13:12:26 +0000 (+1000)
Subject: Fix SignalSpy disconnect issue
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=fc5ddb181896d3a364c046ae21b61283412fc722;p=konrad%2Fqtdeclarative.git

Fix SignalSpy disconnect issue

Task-number:QTBUG-21083
Change-Id: Ic61472d886bf7c46eb37dc44b5e5ceb401917087
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
---

diff --git a/src/imports/testlib/SignalSpy.qml b/src/imports/testlib/SignalSpy.qml
index 8b74132..539cb17 100644
--- a/src/imports/testlib/SignalSpy.qml
+++ b/src/imports/testlib/SignalSpy.qml
@@ -92,7 +92,9 @@ Item {
 
     function qtest_update() {
         if (qtest_prevTarget != null) {
-            qtest_prevTarget[qtest_prevSignalName].disconnect(spy, "qtest_activated")
+            var prevFunc = qtest_prevTarget[qtest_prevSignalName]
+            if (prevFunc)
+                prevFunc.disconnect(spy.qtest_activated)
             qtest_prevTarget = null
             qtest_prevSignalName = ""
         }