diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-08 12:16:18 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-08 12:16:18 +0000 |
| commit | ef5b4d2ada000dcbd239b1cedfb38104e3f40d29 (patch) | |
| tree | 2ae0db1d81072b6693b4758ee7f446db2238f4d5 /src/network | |
| parent | baebb6aa26799e627bc3be6bf41589cef422bed2 (diff) | |
| parent | 9d50df5511e7919d9e03e5f70c693d36af8204f2 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qnativesocketengine_winrt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qnativesocketengine_winrt.cpp b/src/network/socket/qnativesocketengine_winrt.cpp index 62bc8ca683..d547f829f8 100644 --- a/src/network/socket/qnativesocketengine_winrt.cpp +++ b/src/network/socket/qnativesocketengine_winrt.cpp @@ -718,7 +718,7 @@ qint64 QNativeSocketEngine::readDatagram(char *data, qint64 maxlen, QIpPacketHea QByteArray readOrigin; // Do not read the whole datagram. Put the rest of it back into the "queue" if (maxlen < datagram.data.length()) { - QByteArray readOrigin = datagram.data.left(maxlen); + readOrigin = datagram.data.left(maxlen); datagram.data = datagram.data.remove(0, maxlen); d->pendingDatagrams.prepend(datagram); } else { |