summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2020-06-12 10:38:21 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-06-15 15:40:49 +0000
commit96b6f3aab8c6abd448d5755cbeb073b573f8e62a (patch)
tree7af2970368cca0e98c30390d17fa3586442e60ef /tests
parenta7e45f1fccc871f3e3990a32f1c3af611f4fd423 (diff)
long_name_onDemandCerts_member - stop testing/using the deprecated API
Change-Id: I3d7ea78627afcd0225e717d243da49fd70b58461 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> (cherry picked from commit b7724048f9afa8b3c6bbb35f2eb71b766bb68f8c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
index ad9554c7a5..5215204a5c 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
@@ -212,17 +212,6 @@ void tst_QSslSocket_onDemandCertificates_member::onDemandRootCertLoadingMemberMe
{
const QString host("www.qt.io");
-#if QT_DEPRECATED_SINCE(5, 5)
- {
- // not using any root certs -> should not work
- QSslSocketPtr socket2 = newSocket();
- this->socket = socket2.data();
- socket2->setCaCertificates(QList<QSslCertificate>());
- socket2->connectToHostEncrypted(host, 443);
- QVERIFY(!waitForEncrypted(socket2.data()));
- }
-#endif
-
// not using any root certs -> should not work
QSslSocketPtr socket2 = newSocket();
this->socket = socket2.data();
@@ -238,17 +227,6 @@ void tst_QSslSocket_onDemandCertificates_member::onDemandRootCertLoadingMemberMe
socket->connectToHostEncrypted(host, 443);
QVERIFY2(waitForEncrypted(socket.data()), qPrintable(socket->errorString()));
-#if QT_DEPRECATED_SINCE(5, 5)
- {
- // not using any root certs again -> should not work
- QSslSocketPtr socket3 = newSocket();
- this->socket = socket3.data();
- socket3->setCaCertificates(QList<QSslCertificate>());
- socket3->connectToHostEncrypted(host, 443);
- QVERIFY(!waitForEncrypted(socket3.data()));
- }
-#endif
-
// not using any root certs again -> should not work
QSslSocketPtr socket3 = newSocket();
this->socket = socket3.data();