diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 16:28:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 16:28:07 +0100 |
| commit | a9c88c1f39c41215eb9d7288a1fd02aa865e8a04 (patch) | |
| tree | d6229a2370f202d5ff8a5f56da1f43982bc524c2 /src/network/ssl | |
| parent | ff23fb6cf723bcc52a5f037ef92500c480ce5a5c (diff) | |
| parent | 8e22d71b225576ae7ccd6ed349c05219bae7689e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qimage.cpp
src/gui/text/qtextengine.cpp
src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
src/printsupport/kernel/qprintengine_win.cpp
Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index b4c593fa73..3b7fa4da09 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -341,8 +341,9 @@ static QByteArray _q_SubjectInfoToString(QSslCertificate::SubjectInfo info) \fn QString QSslCertificate::issuerInfo(SubjectInfo subject) const Returns the issuer information for the \a subject from the - certificate, or an empty string if there is no information for - \a subject in the certificate. + certificate, or an empty list if there is no information for + \a subject in the certificate. There can be more than one entry + of each type. \sa subjectInfo() */ @@ -359,8 +360,8 @@ QStringList QSslCertificate::issuerInfo(SubjectInfo info) const /*! Returns the issuer information for \a attribute from the certificate, - or an empty string if there is no information for \a attribute in the - certificate. + or an empty list if there is no information for \a attribute in the + certificate. There can be more than one entry for an attribute. \sa subjectInfo() */ @@ -379,8 +380,9 @@ QStringList QSslCertificate::issuerInfo(const QByteArray &attribute) const \fn QString QSslCertificate::subjectInfo(SubjectInfo subject) const - Returns the information for the \a subject, or an empty string if - there is no information for \a subject in the certificate. + Returns the information for the \a subject, or an empty list if + there is no information for \a subject in the certificate. There + can be more than one entry of each type. \sa issuerInfo() */ @@ -396,8 +398,9 @@ QStringList QSslCertificate::subjectInfo(SubjectInfo info) const } /*! - Returns the subject information for \a attribute, or an empty string if - there is no information for \a attribute in the certificate. + Returns the subject information for \a attribute, or an empty list if + there is no information for \a attribute in the certificate. There + can be more than one entry for an attribute. \sa issuerInfo() */ |