diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-01-28 14:47:36 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-01-29 10:53:30 +0100 |
| commit | 33c9a1e0bcf9c7ced67d5ec62225d6295671d33b (patch) | |
| tree | 87fe467c7371d0c02db7dd3678e5ea2aa339867d /src/network/ssl/qsslsocket.cpp | |
| parent | 6f44c40f18397e6656079a196ff4ce36d7563ec7 (diff) | |
Remove some usage of deprecated QSslCertificate::fromPath
The changed function was added in September 2019 in 5.15 branch before
the new overload was added and the old one was deprecated, so we can
freely change it.
Amends 1068d579ee848edf08db5ac611b292c76c30a39b
Change-Id: Iff9d72c26ce557c28b188e1754daa03fd061d531
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index cf971a30bf..19be48a656 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1417,7 +1417,10 @@ bool QSslSocket::addCaCertificates(const QString &path, QSsl::EncodingFormat for QRegExp::PatternSyntax syntax) { Q_D(QSslSocket); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QList<QSslCertificate> certs = QSslCertificate::fromPath(path, format, syntax); +QT_WARNING_POP if (certs.isEmpty()) return false; @@ -2361,7 +2364,10 @@ bool QSslSocketPrivate::addDefaultCaCertificates(const QString &path, QSsl::Enco QRegExp::PatternSyntax syntax) { QSslSocketPrivate::ensureInitialized(); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QList<QSslCertificate> certs = QSslCertificate::fromPath(path, format, syntax); +QT_WARNING_POP if (certs.isEmpty()) return false; |