Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	tests/auto/quick/qquicktableview/tst_qquicktableview.cpp

Change-Id: If3bf1abc23a59c458be0bb862d92f2edcb16b79f

1 files changed, 2 insertions, 12 deletions

diff --git a/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml b/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml
index 31fe5e4a5e..259f45b7d2 100644
--- a/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml
+++ b/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml
@@ -10,18 +10,8 @@ QtObject {
     signal testSignal(SignalParam spp);
 
     function emitTestSignal() {
-        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 = true;
+        testSignal(op);
 
         testObject.expectNull = false;
         testSignal(p);