projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typos
[quassel.git]
/
src
/
qtui
/
sslinfodlg.cpp
diff --git
a/src/qtui/sslinfodlg.cpp
b/src/qtui/sslinfodlg.cpp
index
ed04486
..
b06c74d
100644
(file)
--- a/
src/qtui/sslinfodlg.cpp
+++ b/
src/qtui/sslinfodlg.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
19
by the Quassel Project *
+ * Copyright (C) 2005-20
22
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-67,12
+67,19
@@
void SslInfoDlg::setCurrentCert(int index)
ui.issuerState->setText(issuerInfo(cert, QSslCertificate::StateOrProvinceName));
ui.issuerCity->setText(issuerInfo(cert, QSslCertificate::LocalityName));
ui.issuerState->setText(issuerInfo(cert, QSslCertificate::StateOrProvinceName));
ui.issuerCity->setText(issuerInfo(cert, QSslCertificate::LocalityName));
- if (socket()->sslErrors().isEmpty())
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ const auto& sslErrors = socket()->sslErrors();
+#else
+ const auto& sslErrors = socket()->sslHandshakeErrors();
+#endif
+ if (sslErrors.isEmpty()) {
ui.trusted->setText(tr("Yes"));
ui.trusted->setText(tr("Yes"));
+ }
else {
QString errorString = tr("No, for the following reasons:<ul>");
else {
QString errorString = tr("No, for the following reasons:<ul>");
- for
each (const QSslError& error, socket()->sslErrors())
+ for
(const auto& error : sslErrors) {
errorString += "<li>" + error.errorString() + "</li>";
errorString += "<li>" + error.errorString() + "</li>";
+ }
errorString += "</ul>";
ui.trusted->setText(errorString);
}
errorString += "</ul>";
ui.trusted->setText(errorString);
}