diff --git a/src/network/qnetworkcommon_p.h b/src/network/qnetworkcommon_p.h index 568bce83d..0521d494c 100644 --- a/src/network/qnetworkcommon_p.h +++ b/src/network/qnetworkcommon_p.h @@ -23,19 +23,6 @@ static void downloadBufferDeleter(char *ptr) delete[] ptr; } -/* - Returns the difference between msecs and elapsed. If msecs is -1, - however, -1 is returned. -*/ -static int qt_timeout_value(int msecs, int elapsed) -{ - if (msecs == -1) - return -1; - - int timeout = msecs - elapsed; - return timeout < 0 ? 0 : timeout; -} - QT_END_NAMESPACE #endif // QNETWORKCOMMON_H diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 492d0c1a4..62c6f74df 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -380,6 +380,7 @@ #include #include #include +#include #include "qnetworkcommon_p.h" #ifdef QABSTRACTSOCKET_DEBUG diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index ce546f4dc..e35440d83 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -46,6 +46,7 @@ #include "qhttp.h" #include "qelapsedtimer.h" #include "qnetworkinterface.h" +#include "qcore_unix_p.h" #include "qnetworkcommon_p.h" #if !defined(QT_NO_NETWORKPROXY) && !defined(QT_NO_HTTP) diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index 9bad5b3bf..46d776296 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -57,6 +57,7 @@ #include "qauthenticator.h" #include "qendian.h" #include "qnetworkinterface.h" +#include "qcore_unix_p.h" #include "qnetworkcommon_p.h" QT_BEGIN_NAMESPACE diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 464cac3ea..a51bd2ef5 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -296,6 +296,7 @@ #include "qsslsocket.h" #include "qsslsocket_openssl_p.h" #include "qsslconfiguration_p.h" +#include "qcore_unix_p.h" #include "qnetworkcommon_p.h" #include