diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:21 +0200 |
| commit | 00156d63eea2fb7681a8a00a3144392d6325e5cb (patch) | |
| tree | 40f5159d523966cac856138a32d6d369c20b536b /src/imports/qmlwebsockets/qqmlwebsocketserver.cpp | |
| parent | c6d19a89046763f680d7f67c6f9989b4f51fc71e (diff) | |
| parent | ba9306ec5a1271275d79b2f48ceb227f79352f33 (diff) | |
| download | qtwebsockets-00156d63eea2fb7681a8a00a3144392d6325e5cb.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05
Diffstat (limited to 'src/imports/qmlwebsockets/qqmlwebsocketserver.cpp')
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocketserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp b/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp index cee04d2..a0f7c78 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp @@ -96,7 +96,7 @@ QT_USE_NAMESPACE /*! \qmlsignal WebSocketServer::clientConnected(WebSocket webSocket) - This signal is emitted when a client connects to this server. + This signal is emitted when a client connects to this server. \a webSocket is the newly created \l [QML]{WebSocket}. */ QQmlWebSocketServer::QQmlWebSocketServer(QObject *parent) |