diff options
| author | Linus Jahn <lnj@kaidan.im> | 2020-10-02 22:56:58 +0200 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2020-10-10 22:33:41 +0200 |
| commit | aaa64971fcf3d72d8b66ebf37b8c1005017a5ea4 (patch) | |
| tree | b2c8f44029b8d1eee0f1382569ca7655d156d3f3 /src/server/QXmppServer.cpp | |
| parent | f28225a6b3413b8e8decac40bfd0ee394e6dee01 (diff) | |
Port remaining Qt-6-removed APIs
Diffstat (limited to 'src/server/QXmppServer.cpp')
| -rw-r--r-- | src/server/QXmppServer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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); } |
