Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: If2a4f50d03fccc2654b8336d9e40daea85d6adca

1 files changed, 42 insertions, 1 deletions

diff --git a/tests/auto/qml/tst_webchannel.qml b/tests/auto/qml/tst_webchannel.qml
index 5e28db3..6da6c4b 100644
--- a/tests/auto/qml/tst_webchannel.qml
+++ b/tests/auto/qml/tst_webchannel.qml
@@ -89,10 +89,15 @@ TestCase {
         }
     }
 
+    TestObject {
+        id: testObject
+        WebChannel.id: "testObject"
+    }
+
     TestWebChannel {
         id: webChannel
         transports: [client.serverTransport]
-        registeredObjects: [myObj, myOtherObj, myFactory]
+        registeredObjects: [myObj, myOtherObj, myFactory, testObject]
     }
 
     function initChannel() {
@@ -407,4 +412,40 @@ TestCase {
         myObj.mySignal(0, myObj);
         compare(signalArg, 42);
     }
+
+    // see also: https://bugreports.qt.io/browse/QTBUG-54074
+    function test_signalArgumentTypeConversion()
+    {
+        var signalArgs = [];
+        function logSignalArgs(arg) {
+            signalArgs.push(arg);
+        }
+        var channel = client.createChannel(function(channel) {
+            var testObject = channel.objects.testObject;
+            testObject.testSignalBool.connect(logSignalArgs);
+            testObject.testSignalInt.connect(logSignalArgs);
+            testObject.triggerSignals();
+        });
+        client.awaitInit();
+
+        var msg = client.awaitMessage();
+        compare(msg.type, JSClient.QWebChannelMessageTypes.connectToSignal);
+        compare(msg.object, "testObject");
+
+        msg = client.awaitMessage();
+        compare(msg.type, JSClient.QWebChannelMessageTypes.connectToSignal);
+        compare(msg.object, "testObject");
+
+        msg = client.awaitMessage();
+        compare(msg.type, JSClient.QWebChannelMessageTypes.invokeMethod);
+        client.awaitIdle();
+
+        compare(signalArgs, [
+            true,
+            false,
+            42,
+            1,
+            0
+        ]);
+    }
 }