1 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml b/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml
index 259f45b7d2..31fe5e4a5e 100644
--- a/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml
+++ b/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml
@@ -10,8 +10,18 @@ QtObject {
     signal testSignal(SignalParam spp);
 
     function emitTestSignal() {
-        testObject.expectNull = true;
-        testSignal(op);
+        var caught = false;
+        try {
+            testObject.expectNull = true;
+            testSignal(op);
+        } catch(e) {
+            // good: We want a type error here
+            caught = true;
+            if (handleSignal)
+                testObject.determineSuccess(null);
+        }
+        if (!caught && handleSignal)
+            testObject.determineSuccess("fail");
 
         testObject.expectNull = false;
         testSignal(p);