diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2014-01-31 17:39:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-06 23:55:11 +0100 |
| commit | 6547d3305a872163158510cae5b8fc61efb8bca0 (patch) | |
| tree | 8a51312a8c598207c53e1027169c52f0d214d06b /src/webchannel/qwebchannel.js | |
| parent | 6b3569c2cb761afe4eba626067b7c686eda866e6 (diff) | |
| download | qtwebchannel-6547d3305a872163158510cae5b8fc61efb8bca0.tar.gz | |
Port code to QtWebSockets.
This removes the custom WebSocket server implementation and replaces
it by a dependency on the QtWebSockets module.
Sadly, the QtWebSocket module does not yet support custom protocols.
Also, there is quite some boiler plate code required, something which
I want to simplify upstream in the QtWebSockets module later.
Change-Id: I8066418fb1857d23b8593c443bc9a98ded917a99
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/webchannel/qwebchannel.js')
| -rw-r--r-- | src/webchannel/qwebchannel.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webchannel/qwebchannel.js b/src/webchannel/qwebchannel.js index 887c5a0..9aa174b 100644 --- a/src/webchannel/qwebchannel.js +++ b/src/webchannel/qwebchannel.js @@ -101,7 +101,8 @@ var QWebChannel = function(baseUrlOrSocket, initCallback, rawChannel) } else { ///TODO: use ssl? var socketUrl = "ws://" + baseUrlOrSocket; - this.socket = new WebSocket(socketUrl, "QWebChannel"); + ///TODO: use QWebChannel protocol, once custom protcols are supported by QtWebSocket + this.socket = new WebSocket(socketUrl /*, "QWebChannel" */); this.socket.onopen = this.initialized this.socket.onclose = function() |