summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qssl.cpp
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-08-03 18:36:55 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-04 16:13:33 +0200
commit8ef86d05f199ebab216da43d5e0a9dc322b657b3 (patch)
treeea8fac9adf6ce41b530bdb2bc6f4b79010f871f9 /src/network/ssl/qssl.cpp
parent69d6012de469185aa70c86fec69fcb908acfde0c (diff)
QSslCertificate: deprecate alternateSubjectNames()
... and add a new method subjectAlternativeNames() instead. This was a typo in the API. Change-Id: Id8704c387c9ff8e1af2b9a524ff628f5c053a294 Reviewed-on: http://codereview.qt.nokia.com/2618 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/network/ssl/qssl.cpp')
-rw-r--r--src/network/ssl/qssl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index 586c8944ca..17f8014e52 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -82,9 +82,9 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \enum QSsl::AlternateNameEntryType
+ \enum QSsl::AlternativeNameEntryType
- Describes the key types for alternate name entries in QSslCertificate.
+ Describes the key types for alternative name entries in QSslCertificate.
\value EmailEntry An email entry; the entry contains an email address that
the certificate is valid for.
@@ -92,7 +92,7 @@ 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::alternateSubjectNames()
+ \sa QSslCertificate::subjectAlternativeNames()
*/