diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:48:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:49:18 +0100 |
| commit | dd756011da13b95fdb630a1bbb90234f1e60f415 (patch) | |
| tree | a6259b1e9b6463108796ce912e3d1752e301505f /src/network/socket/qsocks5socketengine.cpp | |
| parent | 0c50edbe84914469973a3b10e0170023ccdd66fe (diff) | |
| parent | b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
configure.json
mkspecs/win32-icc/qmake.conf
Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
Diffstat (limited to 'src/network/socket/qsocks5socketengine.cpp')
| -rw-r--r-- | src/network/socket/qsocks5socketengine.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index 89261ce789..95a0d0563a 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -1271,13 +1271,6 @@ void QSocks5SocketEnginePrivate::_q_controlSocketStateChanged(QAbstractSocket::S } #ifndef QT_NO_UDPSOCKET -void QSocks5SocketEnginePrivate::checkForDatagrams() const -{ - // udp should be unbuffered so we need to do some polling at certain points - if (udpData->udpSocket->hasPendingDatagrams()) - const_cast<QSocks5SocketEnginePrivate *>(this)->_q_udpSocketReadNotification(); -} - void QSocks5SocketEnginePrivate::_q_udpSocketReadNotification() { QSOCKS5_D_DEBUG << "_q_udpSocketReadNotification()"; @@ -1609,8 +1602,6 @@ bool QSocks5SocketEngine::hasPendingDatagrams() const Q_D(const QSocks5SocketEngine); Q_INIT_CHECK(false); - d->checkForDatagrams(); - return !d->udpData->pendingDatagrams.isEmpty(); } @@ -1618,8 +1609,6 @@ qint64 QSocks5SocketEngine::pendingDatagramSize() const { Q_D(const QSocks5SocketEngine); - d->checkForDatagrams(); - if (!d->udpData->pendingDatagrams.isEmpty()) return d->udpData->pendingDatagrams.head().data.size(); return 0; @@ -1631,8 +1620,6 @@ qint64 QSocks5SocketEngine::readDatagram(char *data, qint64 maxlen, QIpPacketHea #ifndef QT_NO_UDPSOCKET Q_D(QSocks5SocketEngine); - d->checkForDatagrams(); - if (d->udpData->pendingDatagrams.isEmpty()) return 0; |