summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qssl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/ssl/qssl.cpp')
-rw-r--r--src/network/ssl/qssl.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index 60679a201f..932b7c9f99 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -96,18 +96,18 @@ QT_BEGIN_NAMESPACE
\value DnsEntry A DNS host name entry; the entry contains a host name
entry that the certificate is valid for. The entry may contain wildcards.
- \sa QSslCertificate::subjectAlternativeNames()
+ \note In Qt 4, this enum was called \c {AlternateNameEntryType}. That name
+ is deprecated in Qt 5.
+ \sa QSslCertificate::subjectAlternativeNames()
*/
-#if QT_DEPRECATED_SINCE(5,0)
+
/*!
- \enum QSsl::AlternateNameEntryType
- \obsolete
- Use QSsl::AlternativeNameEntryType instead.
- This is a synonym for source compatibility with Qt 4.
- \sa QSsl::AlternativeNameEntryType
+ \typedef QSsl::AlternateNameEntryType
+ \obsolete
+
+ Use QSsl::AlternativeNameEntryType instead.
*/
-#endif
/*!
\enum QSsl::SslProtocol