From aaa64971fcf3d72d8b66ebf37b8c1005017a5ea4 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Fri, 2 Oct 2020 22:56:58 +0200
Subject: Port remaining Qt-6-removed APIs

---
 src/server/QXmppServer.cpp        | 6 +++++-
 src/server/QXmppServerExtension.h | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/server')

diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 4591fc3e..ee146b62 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -39,6 +39,7 @@
 #include <QFileInfo>
 #include <QPluginLoader>
 #include <QSslCertificate>
+#include <QSslConfiguration>
 #include <QSslKey>
 #include <QSslSocket>
 
@@ -886,8 +887,11 @@ void QXmppSslServer::incomingConnection(qintptr socketDescriptor)
     }
 
     if (!d->localCertificate.isNull() && !d->privateKey.isNull()) {
+        auto sslConfig = socket->sslConfiguration();
+        sslConfig.setCaCertificates(sslConfig.caCertificates() + d->caCertificates);
+        socket->setSslConfiguration(sslConfig);
+
         socket->setProtocol(QSsl::AnyProtocol);
-        socket->addCaCertificates(d->caCertificates);
         socket->setLocalCertificate(d->localCertificate);
         socket->setPrivateKey(d->privateKey);
     }
diff --git a/src/server/QXmppServerExtension.h b/src/server/QXmppServerExtension.h
index af736225..946079e8 100644
--- a/src/server/QXmppServerExtension.h
+++ b/src/server/QXmppServerExtension.h
@@ -29,7 +29,6 @@
 #include <QVariant>
 
 class QDomElement;
-class QStringList;
 
 class QXmppServer;
 class QXmppServerExtensionPrivate;
-- 
cgit v1.2.3