diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 06:26:24 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 06:26:24 (GMT) |
| commit | ee88b2d8408396188eb2ce52d740c395c6cd4656 (patch) | |
| tree | 1f59ea0612fecbaca595594d3812dd2aab64cf63 /src/network/socket/qabstractsocket_p.h | |
| parent | 673973acc20ce4e068d63fa5b0391f5c785be8a3 (diff) | |
| parent | aa58293b57a05cd52b36ba14a05958dceb65c603 (diff) | |
| download | Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.zip Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.tar.gz Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.tar.bz2 | |
Merge remote branch 'qt-official/4.6' into 4.6
Diffstat (limited to 'src/network/socket/qabstractsocket_p.h')
| -rw-r--r-- | src/network/socket/qabstractsocket_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index 8ccddd3..acf82bf 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/src/network/socket/qabstractsocket_p.h @@ -93,6 +93,7 @@ public: void _q_startConnecting(const QHostInfo &hostInfo); void _q_testConnection(); void _q_abortConnectionAttempt(); + void _q_forceDisconnect(); bool readSocketNotifierCalled; bool readSocketNotifierState; @@ -148,6 +149,7 @@ public: int blockingTimeout; QTimer *connectTimer; + QTimer *disconnectTimer; int connectTimeElapsed; int hostLookupId; |