diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:31 +0100 |
| commit | a99beb2c7b5867aac0e5ae997042cc88c0f6a175 (patch) | |
| tree | 8d2022a94099c17be4a5ff3fd429731a260190a2 /src/websockets/qwebsocket_p.cpp | |
| parent | cd26439ac7ca1a444e9b5534a504afb0bb411890 (diff) | |
| parent | 203da360c4bcd64bdd17639d495f1857b622e92d (diff) | |
| download | qtwebsockets-a99beb2c7b5867aac0e5ae997042cc88c0f6a175.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3ae5df71f201cfdb9a4c9e7d90a60d1f9792700a
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 6abffdc..1d23c84 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -596,6 +596,9 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket) QObject::connect(sslSocket, &QSslSocket::encryptedBytesWritten, q, &QWebSocket::bytesWritten); typedef void (QSslSocket:: *sslErrorSignalType)(const QList<QSslError> &); + QObjectPrivate::connect(sslSocket, + static_cast<sslErrorSignalType>(&QSslSocket::sslErrors), + this, &QWebSocketPrivate::_q_updateSslConfiguration); QObject::connect(sslSocket, static_cast<sslErrorSignalType>(&QSslSocket::sslErrors), q, &QWebSocket::sslErrors); |