Document QSslCertificate deprecated functions

With the new functions linked

Task-number: QTBUG-24001
Change-Id: I9fd2de746a6342a1f4f182189e7f2529f092c003
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
This commit is contained in:
Shane Kearns 2012-05-02 17:35:00 +01:00 committed by Qt by Nokia
parent 80a23370e6
commit 7b9a0457be

View File

@ -222,16 +222,19 @@ bool QSslCertificate::isNull() const
#if QT_DEPRECATED_SINCE(5,0) #if QT_DEPRECATED_SINCE(5,0)
/*! /*!
\fn bool QSslCertificate::isValid() const \fn bool QSslCertificate::isValid() const
\obsolete
Returns true if this certificate is valid; otherwise returns To verify a certificate, use verify().
false. 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 data-time is within the date-time range during which the
certificate is considered valid, and checks that the certificate is considered valid, and checks that the
certificate is not in a blacklist of fraudulent certificates. certificate is not in a blacklist of fraudulent certificates.
\sa isNull() \sa isNull(), verify(), isBlacklisted(), expiryDate(), effectiveDate()
*/ */
#endif #endif
@ -434,6 +437,15 @@ QList<QByteArray> QSslCertificate::issuerInfoAttributes() const
return d->issuerInfo.uniqueKeys(); return d->issuerInfo.uniqueKeys();
} }
#if QT_DEPRECATED_SINCE(5,0)
/*!
\fn QMultiMap<QSsl::AlternateNameEntryType, QString> alternateSubjectNames() const
\obsolete
Use subjectAlternativeNames();
*/
#endif
/*! /*!
Returns the list of alternative subject names for this Returns the list of alternative subject names for this
certificate. The alternative names typically contain host certificate. The alternative names typically contain host