diff options
| author | axis <qt-info@nokia.com> | 2009-11-06 15:50:21 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-06 15:50:21 +0100 |
| commit | d1aa89647824cbaf9af4fc943d4514018973ddc1 (patch) | |
| tree | e8e13c32613a896311117fc39c45fe8b6f27144d /src/network/socket/qabstractsocket_p.h | |
| parent | 351ba8b9ca4f0db176c9e3553d105be0ef35c844 (diff) | |
| parent | daf5f511ee813fc4fffba64bed558d0413270388 (diff) | |
| download | qt4-tools-d1aa89647824cbaf9af4fc943d4514018973ddc1.tar.gz | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt
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 8ccddd3c8c..acf82bff3e 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; |