Commit 32f2acb7 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile against last qt5.15 without deprecated methods

parent 1dc079fb
...@@ -285,14 +285,23 @@ void SessionThread::sslConnected() ...@@ -285,14 +285,23 @@ void SessionThread::sslConnected()
return; return;
} }
QSslCipher cipher = m_socket->sessionCipher(); QSslCipher cipher = m_socket->sessionCipher();
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
if (!m_socket->sslErrors().isEmpty() || !m_socket->isEncrypted() if (!m_socket->sslErrors().isEmpty()
#else
if (!m_socket->sslHandshakeErrors().isEmpty()
#endif
|| !m_socket->isEncrypted()
|| cipher.isNull() || cipher.usedBits() == 0) { || cipher.isNull() || cipher.usedBits() == 0) {
qCDebug(KIMAP_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() qCDebug(KIMAP_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull()
<< ", cipher.usedBits() is" << cipher.usedBits() << ", cipher.usedBits() is" << cipher.usedBits()
<< ", the socket says:" << m_socket->errorString() << ", the socket says:" << m_socket->errorString()
<< "and the list of SSL errors contains" << "and the list of SSL errors contains"
<< m_socket->sslErrors().count() << "items."; #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
<< m_socket->sslErrors().count()
#else
<< m_socket->sslHandshakeErrors().count()
#endif
<< "items.";
KSslErrorUiData errorData(m_socket.get()); KSslErrorUiData errorData(m_socket.get());
emit sslError(errorData); emit sslError(errorData);
} else { } else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment