diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:13:58 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:13:58 +0200 |
commit | c47ce34597b085b6c6ab03a12e2ed6b246f330ff (patch) | |
tree | 5e1caf130f2f2524a08a372567815591907a9f00 /src | |
parent | 54d8d71690510a577abb2d72b24e6eb5b47e85a9 (diff) | |
parent | 0854eda408de542047a0ef38c37953719a8f9fde (diff) | |
download | qtwebsockets-c47ce34597b085b6c6ab03a12e2ed6b246f330ff.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I587edb09f88db76917755593bfe0cbb5c460ce96
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/qmlwebsockets/plugins.qmltypes | 50 | ||||
-rw-r--r-- | src/websockets/qwebsocket_p.cpp | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes index 8116fce..4404a51 100644 --- a/src/imports/qmlwebsockets/plugins.qmltypes +++ b/src/imports/qmlwebsockets/plugins.qmltypes @@ -38,9 +38,59 @@ Module { name: "activeChanged" Parameter { name: "isActive"; type: "bool" } } + Signal { + name: "errorStringChanged" + Parameter { name: "errorString"; type: "string" } + } Method { name: "sendTextMessage" + type: "qlonglong" Parameter { name: "message"; type: "string" } } } + Component { + name: "QQmlWebSocketServer" + prototype: "QObject" + exports: ["Qt.WebSockets/WebSocketServer 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "url"; type: "QUrl"; isReadonly: true } + Property { name: "host"; type: "string" } + Property { name: "port"; type: "ushort" } + Property { name: "name"; type: "string" } + Property { name: "errorString"; type: "string"; isReadonly: true } + Property { name: "listen"; type: "bool" } + Property { name: "accept"; type: "bool" } + Signal { + name: "clientConnected" + Parameter { name: "webSocket"; type: "QQmlWebSocket"; isPointer: true } + } + Signal { + name: "errorStringChanged" + Parameter { name: "errorString"; type: "string" } + } + Signal { + name: "urlChanged" + Parameter { name: "url"; type: "QUrl" } + } + Signal { + name: "portChanged" + Parameter { name: "port"; type: "ushort" } + } + Signal { + name: "nameChanged" + Parameter { name: "name"; type: "string" } + } + Signal { + name: "hostChanged" + Parameter { name: "host"; type: "string" } + } + Signal { + name: "listenChanged" + Parameter { name: "listen"; type: "bool" } + } + Signal { + name: "acceptChanged" + Parameter { name: "accept"; type: "bool" } + } + } } diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index e1a36c8..602a939 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -541,6 +541,7 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket) QObject::connect(pTcpSocket, &QAbstractSocket::readChannelFinished, q, &QWebSocket::readChannelFinished); QObject::connect(pTcpSocket, &QAbstractSocket::aboutToClose, q, &QWebSocket::aboutToClose); + QObject::connect(pTcpSocket, &QAbstractSocket::bytesWritten, q, &QWebSocket::bytesWritten); //catch signals QObjectPrivate::connect(pTcpSocket, &QAbstractSocket::stateChanged, this, |