diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:00:40 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:00:40 +0200 |
| commit | 70a0a7cfdb19450b09951c28c8738ab99b22d402 (patch) | |
| tree | 4259cf62f6b5343aeb1588ed19abeb7225dc8aee | |
| parent | 4f29e93b157ed6e4e264297d27a8e1c006e098a1 (diff) | |
| parent | 9f88317e29621451c18719abc5e22198b618471f (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I294e66de2e0110e3071d54b646af0509f25a104a
| -rw-r--r-- | src/websockets/qwebsocketserver.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp index 9717401..ecd9da8 100644 --- a/src/websockets/qwebsocketserver.cpp +++ b/src/websockets/qwebsocketserver.cpp @@ -359,6 +359,7 @@ int QWebSocketServer::maxPendingConnections() const handshake their connection is closed. \sa setHandshakeTimeout() + \since 5.14 */ int QWebSocketServer::handshakeTimeout() const { @@ -599,6 +600,7 @@ void QWebSocketServer::setMaxPendingConnections(int numConnections) negative value (e.g. -1) to disable the timeout. \sa handshakeTimeout() + \since 5.14 */ void QWebSocketServer::setHandshakeTimeout(int msec) { |