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/qsslconfiguration.h | |
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/qsslconfiguration.h')
-rw-r--r-- | src/network/ssl/qsslconfiguration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 247f3aecc9..09616098a5 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -132,7 +132,7 @@ public: QList<QSslCertificate> caCertificates() const; void setCaCertificates(const QList<QSslCertificate> &certificates); bool addCaCertificates(const QString &path, QSsl::EncodingFormat format = QSsl::Pem, - QRegExp::PatternSyntax syntax = QRegExp::FixedString); + QSslCertificate::PatternSyntax syntax = QSslCertificate::FixedString); void addCaCertificate(const QSslCertificate &certificate); void addCaCertificates(const QList<QSslCertificate> &certificates); |