diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 10:38:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 11:03:18 +0200 |
| commit | c8ca300e491c186304d0864a9e870337e891e6f7 (patch) | |
| tree | f1d991c5960b5acc0bf2a709960e871d48d91acf /src/network/socket/qabstractsocket.cpp | |
| parent | 31c96d34d27f8cad020238df28c10a71b2c4a34f (diff) | |
| parent | 8b540f68a8404e4b9e3ac65a22c11416a91ee749 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/src.pro
Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 71d6166840..084e0bc656 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -208,6 +208,10 @@ This signal is emitted after an error occurred. The \a socketError parameter describes the type of error that occurred. + When this signal is emitted, the socket may not be ready for a reconnect + attempt. In that case, attempts to reconnect should be done from the event + loop. For example, use a QTimer::singleShot() with 0 as the timeout. + QAbstractSocket::SocketError is not a registered metatype, so for queued connections, you will have to register it with Q_DECLARE_METATYPE() and qRegisterMetaType(). |