summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2014-07-16 14:33:03 +0200
committerMilian Wolff <milian.wolff@kdab.com>2014-07-30 01:31:54 +0200
commit5051411b92b4aca4ed5ec462e7b0e52af4d3951e (patch)
tree9f9ed9c1940db04ccf1a076b7e3471e7d1f73737 /tests
parent94912cf26ba70a2cadd23f1c931395be64c11eac (diff)
downloadqtwebchannel-5051411b92b4aca4ed5ec462e7b0e52af4d3951e.tar.gz
Refactor JavaScript QWebChannel to take an external transport object.
This assimilates the JavaScript side to the QML/C++ side. We get rid of the automagic WebSocket code. Instead, users pass in the WebSocket from the outside, if they want to use that for communication. In the QtWebKit/QtWebEngine cases, we will pass in our custom IPC objects. Change-Id: I15e15b5130f99dc8b39dfbfa8cd3d8b2d34dbbc0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Lutz Schönemann <lutz.schoenemann@basyskom.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/Client.qml3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qml/Client.qml b/tests/auto/qml/Client.qml
index d15fd58..fad1412 100644
--- a/tests/auto/qml/Client.qml
+++ b/tests/auto/qml/Client.qml
@@ -59,10 +59,9 @@ Item {
QtObject {
id: clientTransport
- property var send;
property var onmessage;
- function postMessage(message)
+ function send(message)
{
if (debug) {
console.log("client posts message: ", message);