diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
| commit | a20da2353cc308aab15e3efa05ab7d899e9c6ca7 (patch) | |
| tree | 63881eb44f19384ebfb0e0443291b8f9ab82f149 /src/network/socket | |
| parent | 95f787bfdc890c259e8b347bdad9123d534efe0f (diff) | |
| parent | eaf20420f8a4d72c804a9d3725c3e294b34c78c8 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/gui/image/qpnghandler.cpp
Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qudpsocket.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp index 85c4f4cbfd..0e3d516535 100644 --- a/src/network/socket/qudpsocket.cpp +++ b/src/network/socket/qudpsocket.cpp @@ -381,6 +381,7 @@ qint64 QUdpSocket::writeDatagram(const char *data, qint64 size, const QHostAddre */ /*! + \since 5.8 \overload Sends the datagram \a datagram to the host address and port numbers @@ -431,6 +432,8 @@ qint64 QUdpSocket::writeDatagram(const QNetworkDatagram &datagram) } /*! + \since 5.8 + Receives a datagram no larger than \a maxSize bytes and returns it in the QNetworkDatagram object, along with the sender's host address and port. If possible, this function will also try to determine the datagram's |