1 files changed, 9 insertions, 31 deletions
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index cc41d942..a59cff07 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -50,19 +50,9 @@ TestCase {
     when: windowShown
     name: "ToolButton"
 
-    SignalSpy {
-        id: pressedSpy
-        signalName: "pressedChanged"
-    }
-
-    SignalSpy {
-        id: downSpy
-        signalName: "downChanged"
-    }
-
-    SignalSpy {
-        id: clickedSpy
-        signalName: "clicked"
+    Component {
+        id: signalSpy
+        SignalSpy { }
     }
 
     Component {
@@ -70,20 +60,6 @@ TestCase {
         ToolButton { }
     }
 
-    function init() {
-        verify(!pressedSpy.target)
-        verify(!clickedSpy.target)
-        compare(pressedSpy.count, 0)
-        compare(clickedSpy.count, 0)
-    }
-
-    function cleanup() {
-        pressedSpy.target = null
-        clickedSpy.target = null
-        pressedSpy.clear()
-        clickedSpy.clear()
-    }
-
     function test_text() {
         var control = toolButton.createObject(testCase)
         verify(control)
@@ -101,11 +77,13 @@ TestCase {
         var control = toolButton.createObject(testCase)
         verify(control)
 
-        pressedSpy.target = control
-        downSpy.target = control
-        clickedSpy.target = control
+        var pressedSpy = signalSpy.createObject(control, {target: control, signalName: "pressedChanged"})
         verify(pressedSpy.valid)
+
+        var downSpy = signalSpy.createObject(control, {target: control, signalName: "downChanged"})
         verify(downSpy.valid)
+
+        var clickedSpy = signalSpy.createObject(control, {target: control, signalName: "clicked"})
         verify(clickedSpy.valid)
 
         // check
@@ -170,7 +148,7 @@ TestCase {
         var control = toolButton.createObject(testCase)
         verify(control)
 
-        clickedSpy.target = control
+        var clickedSpy = signalSpy.createObject(control, {target: control, signalName: "clicked"})
         verify(clickedSpy.valid)
 
         control.forceActiveFocus()