diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-06-15 16:23:28 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-06-22 12:11:47 +0200 |
| commit | c2bf56fc3a65cbd6a2a94234a87d8ede4003efe6 (patch) | |
| tree | 8e701d0c1b00f1b761e547919a1a1cc06677aaf9 /src/network/ssl/qsslsocket.h | |
| parent | 29d3e7ce38abd09c85d9b28fbc2f89a16fb155c2 (diff) | |
QSslSocket: remove certificate-related setters
They were deprecated with replacements in QSslConfiguration proposed (and
some without alternative, which we'll provide if there is any demand
in such an API). Special thanks to M.N. for a nice hint on how to
amend the test without introducing a new API.
Change-Id: I7841a5b3f30469d8204b61cb65921c34275e0650
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket.h')
| -rw-r--r-- | src/network/ssl/qsslsocket.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index a091828638..d7a4fbe070 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -196,25 +196,6 @@ public: const QByteArray &passPhrase = QByteArray()); QSslKey privateKey() const; - // CA settings. -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_X("Use QSslConfiguration::addCaCertificate()") void addCaCertificate(const QSslCertificate &certificate); - QT_DEPRECATED_X("Use QSslConfiguration::addCaCertificates()") void addCaCertificates(const QList<QSslCertificate> &certificates); -#endif // QT_DEPRECATED_SINCE(5, 15) -#if QT_DEPRECATED_SINCE(5, 5) - QT_DEPRECATED_X("Use QSslConfiguration::setCaCertificates()") void setCaCertificates(const QList<QSslCertificate> &certificates); - QT_DEPRECATED_X("Use QSslConfiguration::caCertificates()") QList<QSslCertificate> caCertificates() const; -#endif // QT_DEPRECATED_SINCE(5, 5) -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED static void addDefaultCaCertificate(const QSslCertificate &certificate); - QT_DEPRECATED static void addDefaultCaCertificates(const QList<QSslCertificate> &certificates); -#endif // QT_DEPRECATED_SINCE(5, 15) -#if QT_DEPRECATED_SINCE(5, 5) - QT_DEPRECATED static void setDefaultCaCertificates(const QList<QSslCertificate> &certificates); - QT_DEPRECATED static QList<QSslCertificate> defaultCaCertificates(); - QT_DEPRECATED_X("Use QSslConfiguration::systemCaCertificates()") static QList<QSslCertificate> systemCaCertificates(); -#endif // QT_DEPRECATED_SINCE(5, 5) - bool waitForConnected(int msecs = 30000) override; bool waitForEncrypted(int msecs = 30000); bool waitForReadyRead(int msecs = 30000) override; |