From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 24 Mar 2014 23:13:42 +0000 (+0100)
Subject: QSslCertificate::subjectInfo() returns a QStringList in Qt5
X-Git-Tag: 0.11.0~63
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7e867cbefbf6c3a9efa3ef66303b9ec10216b247

QSslCertificate::subjectInfo() returns a QStringList in Qt5
---

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());