Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"

1 files changed, 28 insertions, 2 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 4199c0f465..3b28e7a803 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
@@ -211,10 +211,23 @@ 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();
-    socket2->setCaCertificates(QList<QSslCertificate>());
+    auto sslConfig = socket2->sslConfiguration();
+    sslConfig.setCaCertificates(QList<QSslCertificate>());
+    socket2->setSslConfiguration(sslConfig);
     socket2->connectToHostEncrypted(host, 443);
     QVERIFY(!waitForEncrypted(socket2.data()));
 
@@ -224,10 +237,23 @@ 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();
-    socket3->setCaCertificates(QList<QSslCertificate>());
+    sslConfig = socket3->sslConfiguration();
+    sslConfig.setCaCertificates(QList<QSslCertificate>());
+    socket3->setSslConfiguration(sslConfig);
     socket3->connectToHostEncrypted(host, 443);
     QVERIFY(!waitForEncrypted(socket3.data()));