diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-28 11:23:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-28 11:23:35 +0100 |
| commit | 1139be7b304a52901fbcf9ee9b95c5c7a50054f3 (patch) | |
| tree | d1491761623e5c371e6ccff039ee2bb13dcb6828 /src/network/socket | |
| parent | 6615f1d16b442bbf476d86ab90af1107617945c9 (diff) | |
| parent | 5f66f871816d083da9795d71f746413d6f6118f7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iede384644c3df5ee01b701806dfdb586dd6bb138
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qnativesocketengine_win.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index bd368ac42f..747fdeb967 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -1213,10 +1213,8 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxL msg.dwBufferCount = 1; msg.name = reinterpret_cast<LPSOCKADDR>(&aa); msg.namelen = sizeof(aa); - if (options & (QAbstractSocketEngine::WantDatagramHopLimit | QAbstractSocketEngine::WantDatagramDestination)) { - msg.Control.buf = cbuf; - msg.Control.len = sizeof(cbuf); - } + msg.Control.buf = cbuf; + msg.Control.len = sizeof(cbuf); DWORD flags = 0; DWORD bytesRead = 0; |