diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-27 09:46:33 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-27 09:46:33 +0000 |
| commit | b159a1c3e0d715057e461e5e2707f3845e31b2e9 (patch) | |
| tree | 0f266f436b7c34bdb9eb3115730af70c0b0d819e /src/network/socket | |
| parent | 01d526d18b271281b4f21d7c379e93f8def069c2 (diff) | |
| parent | 23a36fd2bfcdb57849deaa1e10e6e3f7b1156ed8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index a874c1b43f..7bf9a6de7a 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -2181,7 +2181,7 @@ bool QAbstractSocket::waitForReadyRead(int msecs) } do { - if (state() != ConnectedState) + if (state() != ConnectedState && state() != BoundState) return false; bool readyToRead = false; |