summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-05-03 13:57:22 +0100
committerQt by Nokia <qt-info@nokia.com>2012-05-03 19:34:51 +0200
commit12dad8357d7449c0ecfc33a8b7b5e33099fa8e7e (patch)
treec7028cdb83e1fc348e6839b66868ab0e9a910247 /src/network/ssl
parent7b9a0457be10990a76da6db8c5006823ac2f9cf6 (diff)
Document deprecated APIs in QSsl
Task-number: QTBUG-24001 Change-Id: I8d0980bd5418e9324d0a0fe55c00b432c0a98fb1 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/network/ssl')
-rw-r--r--src/network/ssl/qssl.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index b68265f1aa..9a00b2a077 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -95,6 +95,15 @@ QT_BEGIN_NAMESPACE
\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
+*/
+#endif
/*!
\enum QSsl::SslProtocol
@@ -104,6 +113,7 @@ QT_BEGIN_NAMESPACE
\value SslV3 SSLv3
\value SslV2 SSLv2
\value TlsV1_0 TLSv1.0
+ \value TlsV1 Obsolete, means the same as TlsV1_0
\value UnknownProtocol The cipher's protocol cannot be determined.
\value AnyProtocol The socket understands SSLv2, SSLv3, and TLSv1.0. This
value is used by QSslSocket only.