projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
QSslCertificate::subjectInfo() returns a QStringList in Qt5
[quassel.git]
/
src
/
qtui
/
settingspages
/
identityeditwidget.cpp
diff --git
a/src/qtui/settingspages/identityeditwidget.cpp
b/src/qtui/settingspages/identityeditwidget.cpp
index
6585891
..
25d5abc
100644
(file)
--- 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 {
ui.clearOrLoadCertButton->setText(tr("Load"));
}
else {
+#if QT_VERSION < 0x050000
ui.certOrgLabel->setText(cert.subjectInfo(QSslCertificate::Organization));
ui.certCNameLabel->setText(cert.subjectInfo(QSslCertificate::CommonName));
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());
ui.clearOrLoadCertButton->setText(tr("Clear"));
}
ui.certOrgLabel->setProperty("sslCert", cert.toPem());