diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 15:05:51 +0100 |
| commit | 534ed7ddbe86c58dc7d59c5c693b027ed8f18737 (patch) | |
| tree | b5fe6e7deec116c213f7eadc5a3b142600bb2a1b /src/websockets/qwebsocket_p.cpp | |
| parent | f7c5b8fce9517b3062eeab0ec7e8e46867d1f977 (diff) | |
| parent | 57e1ebecf0e9e1fbc23f7fe32a90c63e242e692b (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/websockets/qwebsocket_p.cpp
tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
Change-Id: I40922fab198a09a3fbba1b2f11b42f2d40e53720
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 1a1bb1f..1cfa106 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -593,6 +593,9 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket) &QWebSocket::preSharedKeyAuthenticationRequired); QObject::connect(sslSocket, &QSslSocket::encryptedBytesWritten, q, &QWebSocket::bytesWritten); + QObjectPrivate::connect(sslSocket, + QOverload<const QList<QSslError>&>::of(&QSslSocket::sslErrors), + this, &QWebSocketPrivate::_q_updateSslConfiguration); QObject::connect(sslSocket, QOverload<const QList<QSslError>&>::of(&QSslSocket::sslErrors), q, &QWebSocket::sslErrors); |