From 7e867cbefbf6c3a9efa3ef66303b9ec10216b247 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 25 Mar 2014 00:13:42 +0100 Subject: [PATCH] QSslCertificate::subjectInfo() returns a QStringList in Qt5 --- src/qtui/settingspages/identityeditwidget.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qtui/settingspages/identityeditwidget.cpp b/src/qtui/settingspages/identityeditwidget.cpp index 65858912..25d5abc8 100644 --- a/src/qtui/settingspages/identityeditwidget.cpp +++ b/src/qtui/settingspages/identityeditwidget.cpp @@ -408,8 +408,13 @@ void IdentityEditWidget::showCertState(const QSslCertificate &cert) ui.clearOrLoadCertButton->setText(tr("Load")); } else { +#if QT_VERSION < 0x050000 ui.certOrgLabel->setText(cert.subjectInfo(QSslCertificate::Organization)); ui.certCNameLabel->setText(cert.subjectInfo(QSslCertificate::CommonName)); +#else + ui.certOrgLabel->setText(cert.subjectInfo(QSslCertificate::Organization).join(", ")); + ui.certCNameLabel->setText(cert.subjectInfo(QSslCertificate::CommonName).join(", ")); +#endif ui.clearOrLoadCertButton->setText(tr("Clear")); } ui.certOrgLabel->setProperty("sslCert", cert.toPem()); -- 2.20.1