From ef185021bcda2b7ff15e0b555fb2a48b86d867d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Heskestad?= Date: Wed, 8 Feb 2023 15:08:24 +0100 Subject: Fix QML WebSocket Server Example Client websocket did not connect to websocket server before, but now connects to server after server has started. Also fix signal handlers to use JavaScript functions with formal arguments, because signal handlers should no longer rely on injection of parameters. Task-number: QTBUG-110894 Pick-to: 6.5 Change-Id: I02242e26bad85fe94c0d3b1ea4b9dd4b2c0cbcfd Reviewed-by: Fabian Kosmale --- .../qmlwebsocketserver/qml/qmlwebsocketserver/main.qml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml b/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml index 815d0b0..644e4d6 100644 --- a/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml +++ b/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml @@ -15,7 +15,7 @@ Rectangle { WebSocketServer { id: server listen: true - onClientConnected: { + onClientConnected: function(webSocket) { webSocket.onTextMessageReceived.connect(function(message) { appendMessage(qsTr("Server received message: %1").arg(message)); webSocket.sendTextMessage(qsTr("Hello Client!")); @@ -29,7 +29,9 @@ Rectangle { WebSocket { id: socket url: server.url - onTextMessageReceived: appendMessage(qsTr("Client received message: %1").arg(message)) + onTextMessageReceived: function(message) { + appendMessage(qsTr("Client received message: %1").arg(message)); + } onStatusChanged: { if (socket.status == WebSocket.Error) { appendMessage(qsTr("Client error: %1").arg(socket.errorString)); @@ -39,6 +41,14 @@ Rectangle { } } + Timer { + interval: 100 + running: true + onTriggered: { + socket.active = true; + } + } + Text { id: messageBox text: qsTr("Click to send a message!") -- cgit v1.2.1