diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/network.pro | 4 | ||||
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/network/network.pro b/src/network/network.pro index 4ee71b028e..cfd3f95300 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -1,3 +1,5 @@ +load(qt_module) + # Qt network module TARGET = QtNetwork QPRO_PWD = $$PWD @@ -18,7 +20,7 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore -include(../qbase.pri) +load(qt_module_config) HEADERS += $$QT_SOURCE_TREE/src/network/qtnetworkversion.h diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 46665176cf..5316626638 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1908,7 +1908,7 @@ bool QAbstractSocket::waitForReadyRead(int msecs) if (state() != ConnectedState) return false; - } while (qt_timeout_value(msecs, stopWatch.elapsed()) > 0); + } while (msecs == -1 || qt_timeout_value(msecs, stopWatch.elapsed()) > 0); return false; } |