1 files changed, 5 insertions, 22 deletions

diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index 30bc8ae7d5..27657956df 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -372,7 +372,7 @@ QSocks5BindData *QSocks5BindStore::retrieve(qintptr socketDescriptor)
     store.erase(it);
     if (bindData) {
         if (bindData->controlSocket->thread() != QThread::currentThread()) {
-            qWarning("Can not access socks5 bind data from different thread");
+            qWarning("Cannot access socks5 bind data from different thread");
             return 0;
         }
     } else {
@@ -706,7 +706,7 @@ void QSocks5SocketEnginePrivate::reauthenticate()
 
     // we require authentication
     QAuthenticator auth;
-    emit q->proxyAuthenticationRequired(proxyInfo, &auth);
+    q->proxyAuthenticationRequired(proxyInfo, &auth);
 
     if (!auth.user().isEmpty() || !auth.password().isEmpty()) {
         // we have new credentials, let's try again
@@ -915,7 +915,7 @@ void QSocks5SocketEnginePrivate::_q_emitPendingReadNotification()
     if (readNotificationEnabled) {
         QSOCKS5_D_DEBUG << "emitting readNotification";
         QPointer<QSocks5SocketEngine> qq = q;
-        emit q->readNotification();
+        q->readNotification();
         if (!qq)
             return;
         // check if there needs to be a new zero read notification
@@ -944,7 +944,7 @@ void QSocks5SocketEnginePrivate::_q_emitPendingWriteNotification()
     Q_Q(QSocks5SocketEngine);
     if (writeNotificationEnabled) {
         QSOCKS5_D_DEBUG << "emitting writeNotification";
-        emit q->writeNotification();
+        q->writeNotification();
     }
 }
 
@@ -964,7 +964,7 @@ void QSocks5SocketEnginePrivate::_q_emitPendingConnectionNotification()
     connectionNotificationPending = false;
     Q_Q(QSocks5SocketEngine);
     QSOCKS5_D_DEBUG << "emitting connectionNotification";
-    emit q->connectionNotification();
+    q->connectionNotification();
 }
 
 void QSocks5SocketEnginePrivate::emitConnectionNotification()
@@ -1383,23 +1383,6 @@ bool QSocks5SocketEngine::bind(const QHostAddress &addr, quint16 port)
         d->localAddress = QHostAddress();
         d->udpData->associatePort = d->localPort;
         d->localPort = 0;
-        QUdpSocket dummy;
-#ifndef QT_NO_BEARERMANAGEMENT
-        dummy.setProperty("_q_networksession", property("_q_networksession"));
-#endif
-        dummy.setProxy(QNetworkProxy::NoProxy);
-        if (!dummy.bind()
-            || writeDatagram(0,0, QIpPacketHeader(d->data->controlSocket->localAddress(), dummy.localPort())) != 0
-            || !dummy.waitForReadyRead(qt_subtract_from_timeout(msecs, stopWatch.elapsed()))
-            || dummy.readDatagram(0,0, &d->localAddress, &d->localPort) != 0) {
-            QSOCKS5_DEBUG << "udp actual address and port lookup failed";
-            setState(QAbstractSocket::UnconnectedState);
-            setError(dummy.error(), dummy.errorString());
-            d->data->controlSocket->close();
-            //### reset and error
-            return false;
-        }
-        QSOCKS5_DEBUG << "udp actual address and port" << d->localAddress << ':' << d->localPort;
         return true;
 #endif // QT_NO_UDPSOCKET
     }