aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-14 22:38:15 +0200
committerMontel Laurent <[email protected]>2017-09-14 22:38:15 +0200
commit9a7e2ae8e1df3bde247c353a8871d2d7129f6f13 (patch)
tree9b2c08c5286ea5ccdb02f31742b2cc4527e28b59
parentb3b6253de93d6a3adc28bc68d578eb87e3233c4b (diff)
Remove deprecated method
-rw-r--r--CMakeLists.txt2
-rw-r--r--autotests/kimaptest/sslserver.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 712b030..5b68ae0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5IMAP")
add_definitions(-DTRANSLATION_DOMAIN=\"libkimap5\")
add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
-#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
configure_package_config_file(
diff --git a/autotests/kimaptest/sslserver.cpp b/autotests/kimaptest/sslserver.cpp
index 878d013..b26ab05 100644
--- a/autotests/kimaptest/sslserver.cpp
+++ b/autotests/kimaptest/sslserver.cpp
@@ -83,7 +83,7 @@ void SslServer::incomingConnection(qintptr handle)
socket->setPrivateKey(ssl_key);
socket->setLocalCertificate(ssl_cert);
- socket->setCaCertificates(QList<QSslCertificate>() << ssl_cert);
+ socket->addCaCertificates(QList<QSslCertificate>() << ssl_cert);
socket->setPeerVerifyMode(QSslSocket::VerifyNone);
socket->ignoreSslErrors();
connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(sslErrors(QList<QSslError>)));