diff options
authorShane Kearns <>2012-05-02 17:35:00 +0100
committerQt by Nokia <>2012-05-03 19:34:37 +0200
commit7b9a0457be10990a76da6db8c5006823ac2f9cf6 (patch)
parent80a23370e64e9aec1e3118dfc58e6e6736867b15 (diff)
Document QSslCertificate deprecated functions
With the new functions linked Task-number: QTBUG-24001 Change-Id: I9fd2de746a6342a1f4f182189e7f2529f092c003 Reviewed-by: Casper van Donderen <>
1 files changed, 16 insertions, 4 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 7282546a8a..af60d8fed0 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -222,16 +222,19 @@ bool QSslCertificate::isNull() const
\fn bool QSslCertificate::isValid() const
+ \obsolete
- Returns true if this certificate is valid; otherwise returns
- false.
+ To verify a certificate, use verify().
+ To check if a certificate is blacklisted, use isBlacklisted().
+ To check if a certificate has expired or is not yet valid, compare
+ expiryDate() and effectiveDate() with QDateTime::currentDateTime()
- Note: Currently, this function checks that the current
+ This function checks that the current
data-time is within the date-time range during which the
certificate is considered valid, and checks that the
certificate is not in a blacklist of fraudulent certificates.
- \sa isNull()
+ \sa isNull(), verify(), isBlacklisted(), expiryDate(), effectiveDate()
@@ -434,6 +437,15 @@ QList<QByteArray> QSslCertificate::issuerInfoAttributes() const
return d->issuerInfo.uniqueKeys();
+ \fn QMultiMap<QSsl::AlternateNameEntryType, QString> alternateSubjectNames() const
+ \obsolete
+ Use subjectAlternativeNames();
Returns the list of alternative subject names for this
certificate. The alternative names typically contain host