1 files changed, 34 insertions, 5 deletions

diff --git a/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml b/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
index c038788..de3c89e 100644
--- a/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
+++ b/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
@@ -38,27 +38,56 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 import QtQuick 2.0
-import Qt.Playground.WebSockets 1.0
+import Qt.WebSockets 1.0
 
 Rectangle {
     width: 360
     height: 360
 
     WebSocket {
-
+        id: socket
+        url: "ws://echo.websocket.org"
+        onTextMessageReceived: {
+            messageBox.text = messageBox.text + "\nReceived message: " + message
+        }
+        onStatusChanged: if (socket.status == WebSocket.Error) {
+                             console.log("Error: " + socket.errorString)
+                         } else if (socket.status == WebSocket.Open) {
+                             socket.sendTextMessage("Hello World")
+                         } else if (socket.status == WebSocket.Closed) {
+                             messageBox.text += "\nSocket closed"
+                         }
+        active: false
     }
 
+    WebSocket {
+        id: secureWebSocket
+        url: "wss://echo.websocket.org"
+        onTextMessageReceived: {
+            messageBox.text = messageBox.text + "\nReceived secure message: " + message
+        }
+        onStatusChanged: if (secureWebSocket.status == WebSocket.Error) {
+                             console.log("Error: " + secureWebSocket.errorString)
+                         } else if (secureWebSocket.status == WebSocket.Open) {
+                             secureWebSocket.sendTextMessage("Hello Secure World")
+                         } else if (secureWebSocket.status == WebSocket.Closed) {
+                             messageBox.text += "\nSecure socket closed"
+                         }
+        active: false
+    }
     Text {
-        text: qsTr("Hello World")
+        id: messageBox
+        text: socket.status == WebSocket.Open ? qsTr("Sending...") : qsTr("Welcome!")
         anchors.centerIn: parent
     }
 
     MouseArea {
         anchors.fill: parent
         onClicked: {
-            Qt.quit();
+            socket.active = !socket.active
+            secureWebSocket.active =  !secureWebSocket.active;
+            //Qt.quit();
         }
     }
 }