From b7724048f9afa8b3c6bbb35f2eb71b766bb68f8c Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 12 Jun 2020 10:38:21 +0200 Subject: long_name_onDemandCerts_member - stop testing/using the deprecated API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 5.15 Change-Id: I3d7ea78627afcd0225e717d243da49fd70b58461 Reviewed-by: Mårten Nordheim --- .../tst_qsslsocket_onDemandCertificates_member.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'tests/auto/network/ssl') 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()); - 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()); - 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(); -- cgit v1.2.3