X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsslinfodlg.cpp;h=a549d8fc76ecbf147793de6180e2adf5ab67a887;hp=584303e6942a562d033516cf0eb751e325ac9ca3;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hpb=c55df5f2d765b100b7a1ead5a72202f969aa9581 diff --git a/src/qtui/sslinfodlg.cpp b/src/qtui/sslinfodlg.cpp index 584303e6..a549d8fc 100644 --- a/src/qtui/sslinfodlg.cpp +++ b/src/qtui/sslinfodlg.cpp @@ -80,32 +80,18 @@ void SslInfoDlg::setCurrentCert(int index) ui.validity->setText(tr("%1 to %2").arg(cert.effectiveDate().date().toString(Qt::ISODate), cert.expiryDate().date().toString(Qt::ISODate))); ui.md5Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Md5))); ui.sha1Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha1))); -#if QT_VERSION < 0x050000 - // Qt 4 doesn't include SHA-2 hashes, so hide the row - ui.sha256Label->hide(); - ui.sha256Digest->hide(); -#else ui.sha256Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha256))); -#endif } // in Qt5, subjectInfo returns a QStringList(); turn this into a comma-separated string instead QString SslInfoDlg::subjectInfo(const QSslCertificate &cert, QSslCertificate::SubjectInfo subjectInfo) const { -#if QT_VERSION < 0x050000 - return cert.subjectInfo(subjectInfo); -#else return cert.subjectInfo(subjectInfo).join(", "); -#endif } // same here QString SslInfoDlg::issuerInfo(const QSslCertificate &cert, QSslCertificate::SubjectInfo subjectInfo) const { -#if QT_VERSION < 0x050000 - return cert.issuerInfo(subjectInfo); -#else return cert.issuerInfo(subjectInfo).join(", "); -#endif }