Merge remote-tracking branch 'origin/dev' into ios-wireguard
This commit is contained in:
commit
7c46e42820
16 changed files with 92 additions and 39 deletions
|
|
@ -940,8 +940,8 @@ void SshConnectionPrivate::connectToHost()
|
|||
this, &SshConnectionPrivate::handleSocketConnected);
|
||||
connect(m_socket, &QIODevice::readyRead,
|
||||
this, &SshConnectionPrivate::handleIncomingData);
|
||||
connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
|
||||
SLOT(handleSocketError()));
|
||||
connect(m_socket, &QAbstractSocket::errorOccurred,
|
||||
this, &SshConnectionPrivate::handleSocketError);
|
||||
connect(m_socket, &QAbstractSocket::disconnected,
|
||||
this, &SshConnectionPrivate::handleSocketDisconnected);
|
||||
connect(&m_timeoutTimer, &QTimer::timeout, this, &SshConnectionPrivate::handleTimeout);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue