summaryrefslogtreecommitdiff
path: root/examples/websockets
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-23 16:00:29 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-23 16:00:29 +0100
commit6b19edaefe7edcdc12a1faa269d77e42a14fc81d (patch)
tree2c5a803fc8f7b0e8b2c83f49dcd846c2dba72e16 /examples/websockets
parent5fc2b148cfa763007810d7b6256ea50d82bf7e45 (diff)
parent8fc139318b2f870aa633e93874b3fa6e9d1113ae (diff)
downloadqtwebsockets-6b19edaefe7edcdc12a1faa269d77e42a14fc81d.tar.gz
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts: dependencies.yaml Change-Id: I1608720522e974c7107f00599a9fb70f17865189
Diffstat (limited to 'examples/websockets')
-rw-r--r--examples/websockets/sslechoserver/sslechoserver.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/websockets/sslechoserver/sslechoserver.cpp b/examples/websockets/sslechoserver/sslechoserver.cpp
index 00bc6c1..5dc41e0 100644
--- a/examples/websockets/sslechoserver/sslechoserver.cpp
+++ b/examples/websockets/sslechoserver/sslechoserver.cpp
@@ -77,7 +77,6 @@ SslEchoServer::SslEchoServer(quint16 port, QObject *parent) :
sslConfiguration.setPeerVerifyMode(QSslSocket::VerifyNone);
sslConfiguration.setLocalCertificate(certificate);
sslConfiguration.setPrivateKey(sslKey);
- sslConfiguration.setProtocol(QSsl::TlsV1SslV3);
m_pWebSocketServer->setSslConfiguration(sslConfiguration);
if (m_pWebSocketServer->listen(QHostAddress::Any, port))