1 files changed, 11 insertions, 5 deletions
diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h
index 4209a32ca7..9ee79cebc1 100644
--- a/src/network/socket/qabstractsocketengine_p.h
+++ b/src/network/socket/qabstractsocketengine_p.h
@@ -19,8 +19,9 @@
 #include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtNetwork/qhostaddress.h"
 #include "QtNetwork/qabstractsocket.h"
-#include "private/qobject_p.h"
+#include <QtCore/qdeadlinetimer.h>
 #include "private/qnetworkdatagram_p.h"
+#include "private/qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -44,6 +45,8 @@ public:
 #endif
 };
 
+static constexpr std::chrono::seconds DefaultTimeout{30};
+
 class Q_AUTOTEST_EXPORT QAbstractSocketEngine : public QObject
 {
     Q_OBJECT
@@ -98,7 +101,7 @@ public:
     virtual bool connectToHostByName(const QString &name, quint16 port) = 0;
     virtual bool bind(const QHostAddress &address, quint16 port) = 0;
     virtual bool listen(int backlog) = 0;
-    virtual int accept() = 0;
+    virtual qintptr accept() = 0;
     virtual void close() = 0;
 
     virtual qint64 bytesAvailable() const = 0;
@@ -128,11 +131,14 @@ public:
     virtual int option(SocketOption option) const = 0;
     virtual bool setOption(SocketOption option, int value) = 0;
 
-    virtual bool waitForRead(int msecs = 30000, bool *timedOut = nullptr) = 0;
-    virtual bool waitForWrite(int msecs = 30000, bool *timedOut = nullptr) = 0;
+    virtual bool waitForRead(QDeadlineTimer deadline = QDeadlineTimer{DefaultTimeout},
+                             bool *timedOut = nullptr) = 0;
+    virtual bool waitForWrite(QDeadlineTimer deadline = QDeadlineTimer{DefaultTimeout},
+                              bool *timedOut = nullptr) = 0;
     virtual bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
                             bool checkRead, bool checkWrite,
-                            int msecs = 30000, bool *timedOut = nullptr) = 0;
+                            QDeadlineTimer deadline = QDeadlineTimer{DefaultTimeout},
+                            bool *timedOut = nullptr) = 0;
 
     QAbstractSocket::SocketError error() const;
     QString errorString() const;