1 files changed, 11 insertions, 6 deletions
diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h
index 3d9ccf0ba1..3a169812df 100644
--- a/src/network/socket/qsocks5socketengine_p.h
+++ b/src/network/socket/qsocks5socketengine_p.h
@@ -16,8 +16,10 @@
 //
 
 #include <QtNetwork/private/qtnetworkglobal_p.h>
+
+#include <QtNetwork/qnetworkproxy.h>
+
 #include "qabstractsocketengine_p.h"
-#include "qnetworkproxy.h"
 
 QT_REQUIRE_CONFIG(socks5);
 
@@ -46,7 +48,7 @@ public:
     bool connectToHostByName(const QString &name, quint16 port) override;
     bool bind(const QHostAddress &address, quint16 port) override;
     bool listen(int backlog) override;
-    int accept() override;
+    qintptr accept() override;
     void close() override;
 
     qint64 bytesAvailable() const override;
@@ -76,11 +78,14 @@ public:
     int option(SocketOption option) const override;
     bool setOption(SocketOption option, int value) override;
 
-    bool waitForRead(int msecs = 30000, bool *timedOut = nullptr) override;
-    bool waitForWrite(int msecs = 30000, bool *timedOut = nullptr) override;
+    bool waitForRead(QDeadlineTimer deadline = QDeadlineTimer{DefaultTimeout},
+                     bool *timedOut = nullptr) override;
+    bool waitForWrite(QDeadlineTimer deadline = QDeadlineTimer{DefaultTimeout},
+                      bool *timedOut = nullptr) override;
     bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
                             bool checkRead, bool checkWrite,
-                            int msecs = 30000, bool *timedOut = nullptr) override;
+                            QDeadlineTimer deadline = QDeadlineTimer{DefaultTimeout},
+                            bool *timedOut = nullptr) override;
 
     bool isReadNotificationEnabled() const override;
     void setReadNotificationEnabled(bool enable) override;
@@ -206,7 +211,7 @@ public:
     void parseRequestMethodReply();
     void parseNewConnection();
 
-    bool waitForConnected(int msecs, bool *timedOut);
+    bool waitForConnected(QDeadlineTimer deadline, bool *timedOut);
 
     void _q_controlSocketConnected();
     void _q_controlSocketReadNotification();