QAbstractSocket: insert timer to prevent timeout

This fixes a timeout that occurred on Mac with the gui event dispatcher:
we were waiting for a write notification, but timed out when we were in
closing state and still waiting for the socket engine to complete
writing.
Now we close the socket anyway after 2 seconds.

Reviewed-by: Thiago Macieira

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;