AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup QSsl code a bit

Browse Source 
to get rid of the remaining deprecated enumerators/related names
and documentation bits.

Fixes: QTBUG-76501
Change-Id: I72aa837daf64d8336c95a4708840e0dec3e82d2b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Timur Pocheptsov 2020-02-11 11:45:31 +01:00
parent c9e67a7926
commit 47189b3a67
4 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/ssl/qssl.cpp
View File

@ -102,19 +102,9 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl");
\value IpAddressEntry An IP address entry; the entry contains an IP address
entry that the certificate is valid for, introduced in Qt 5.13.
\note In Qt 4, this enum was called \c {AlternateNameEntryType}. That name
is deprecated in Qt 5.
\sa QSslCertificate::subjectAlternativeNames()
*/
/*!
\typedef QSsl::AlternateNameEntryType
\obsolete
Use QSsl::AlternativeNameEntryType instead.
*/
/*!
\enum QSsl::SslProtocol
@ -122,7 +112,6 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl");
\value TlsV1_0 TLSv1.0
\value TlsV1_0OrLater TLSv1.0 and later versions. This option is not available when using the WinRT backend due to platform limitations.
\value TlsV1 Obsolete, means the same as TlsV1_0
\value TlsV1_1 TLSv1.1. When using the WinRT backend this option will also enable TLSv1.0.
\value TlsV1_1OrLater TLSv1.1 and later versions. This option is not available when using the WinRT backend due to platform limitations.
\value TlsV1_2 TLSv1.2. When using the WinRT backend this option will also enable TLSv1.0 and TLSv1.1.

4
src/network/ssl/qssl.h
View File

@ -72,10 +72,6 @@ namespace QSsl {
IpAddressEntry
};
#if QT_DEPRECATED_SINCE(5,0)
typedef AlternativeNameEntryType AlternateNameEntryType;
#endif
enum SslProtocol {
TlsV1_0 = 2,
TlsV1_1,

9
src/network/ssl/qsslcertificate.cpp
View File

@ -373,15 +373,6 @@ QByteArray QSslCertificate::digest(QCryptographicHash::Algorithm algorithm) cons
\sa subjectInfo()
*/
#if QT_DEPRECATED_SINCE(5,0)
/*!
\fn QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubjectNames() const
\obsolete
Use QSslCertificate::subjectAlternativeNames();
*/
#endif
/*!
\fn QMultiMap<QSsl::AlternativeNameEntryType, QString> QSslCertificate::subjectAlternativeNames() const

4
src/network/ssl/qsslcertificate.h
View File

@ -130,10 +130,6 @@ public:
QList<QByteArray> subjectInfoAttributes() const;
QList<QByteArray> issuerInfoAttributes() const;
#if QT_DEPRECATED_SINCE(5,0)
QT_DEPRECATED inline QMultiMap<QSsl::AlternateNameEntryType, QString>
alternateSubjectNames() const { return subjectAlternativeNames(); }
#endif
QMultiMap<QSsl::AlternativeNameEntryType, QString> subjectAlternativeNames() const;
QDateTime effectiveDate() const;
QDateTime expiryDate() const;