summaryrefslogtreecommitdiffstats
path: root/src/network/socket
diff options
context:
space:
mode:
authorartoka <arto.katajasalo@digia.com>2011-11-28 08:15:12 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-01-30 17:06:51 (GMT)
commit3826203f744a2147bebf5f088de0d524156f59fd (patch)
treee02da15a659c9ac7361f7b07faaec3c104c26a63 /src/network/socket
parent70170a1c32fc32832359fec14e1e1af7a1968fe9 (diff)
downloadQt-3826203f744a2147bebf5f088de0d524156f59fd.zip
Qt-3826203f744a2147bebf5f088de0d524156f59fd.tar.gz
Qt-3826203f744a2147bebf5f088de0d524156f59fd.tar.bz2
Various Qt documentation bug fixes (wk 42)
Task-number: QTBUG-18101 Task-number: QTBUG-8673 Task-number: QTBUG-14194 Task-number: QTBUG-9109 Task-number: QTBUG-9466 Task-number: QTBUG-8323 Task-number: QTBUG-7924 Task-number: QTBUG-20355 Task-number: QTBUG-19367 Task-number: QTBUG-21295 Task-number: QTBUG-14554 Task-number: QTBUG-8331 Task-number: QTBUG-8329 Task-number: QTBUG-8786 Task-number: QTBUG-8787 Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/network/socket')
-rw-r--r--src/network/socket/qabstractsocket.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 411ac03..533ebd9 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -301,20 +301,23 @@
\value ProxyAuthenticationRequiredError The socket is using a proxy, and
the proxy requires authentication.
\value SslHandshakeFailedError The SSL/TLS handshake failed, so
- the connection was closed (only used in QSslSocket)
+ the connection was closed (only used in QSslSocket) (This value was introduced in 4.4.)
\value UnfinishedSocketOperationError Used by QAbstractSocketEngine only,
The last operation attempted has not finished yet (still in progress in
- the background).
+ the background). (This value was introduced in 4.4.)
\value ProxyConnectionRefusedError Could not contact the proxy server because
- the connection to that server was denied
+ the connection to that server was denied (This value was introduced in 4.5.)
\value ProxyConnectionClosedError The connection to the proxy server was closed
unexpectedly (before the connection to the final peer was established)
+ (This value was introduced in 4.5.)
\value ProxyConnectionTimeoutError The connection to the proxy server timed out
or the proxy server stopped responding in the authentication phase.
+ (This value was introduced in 4.5.)
\value ProxyNotFoundError The proxy address set with setProxy() (or the application
- proxy) was not found.
+ proxy) was not found. (This value was introduced in 4.5.)
\value ProxyProtocolError The connection negotiation with the proxy server
because the response from the proxy server could not be understood.
+ (This value was introduced in 4.5.)
\value UnknownSocketError An unidentified error occurred.
\sa QAbstractSocket::error()