1 files changed, 12 insertions, 3 deletions
diff --git a/src/network/ssl/qsslserver.cpp b/src/network/ssl/qsslserver.cpp
index 497ea5bd3c..40a6a6f526 100644
--- a/src/network/ssl/qsslserver.cpp
+++ b/src/network/ssl/qsslserver.cpp
@@ -16,7 +16,7 @@
     Transport Layer Security (TLS).
 
     To configure the secure handshake settings, use the applicable setter
-    functions on a QSslConfiguration object, and then use it as a argument
+    functions on a QSslConfiguration object, and then use it as an argument
     to the setSslConfiguration() function. All following incoming
     connections handled will use these settings.
 
@@ -32,7 +32,7 @@
     nextPendingConnection() function to fetch the next incoming connection and
     take it out of the pending connection queue. The QSslSocket is a child of
     the QSslServer and will be deleted when the QSslServer is deleted. It is
-    still a good a good idea to destroy the object explicitly when you are done
+    still a good idea to destroy the object explicitly when you are done
     with it, to avoid wasting memory.
 
     \sa QTcpServer, QSslConfiguration, QSslSocket
@@ -171,6 +171,13 @@
    QSslConfiguration::setHandshakeMustInterruptOnError()
 */
 
+/*!
+    \fn void QSslServer::startedEncryptionHandshake(QSslSocket *socket)
+
+    This signal is emitted when the client, connected to \a socket,
+    initiates the TLS handshake.
+*/
+
 #include "qsslserver.h"
 #include "qsslserver_p.h"
 
@@ -334,7 +341,7 @@ void QSslServerPrivate::initializeHandshakeProcess(QSslSocket *socket)
             });
     auto it = socketData.emplace(quintptr(socket), readyRead, destroyed, std::make_shared<QTimer>());
     it->timeoutTimer->setSingleShot(true);
-    it->timeoutTimer->callOnTimeout([this, socket]() { handleHandshakeTimedOut(socket); });
+    it->timeoutTimer->callOnTimeout(q, [this, socket]() { handleHandshakeTimedOut(socket); });
     it->timeoutTimer->setInterval(handshakeTimeout);
     it->timeoutTimer->start();
 }
@@ -401,3 +408,5 @@ void QSslServerPrivate::handleHandshakeTimedOut(QSslSocket *socket)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsslserver.cpp"