diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-08-29 13:09:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-08-29 13:09:51 +0200 |
| commit | aca76b9ee89eb3f4a12c73d9ec8b442a0bca03fb (patch) | |
| tree | 1f3d7d48c47f661b8a5ace76b863d62c9bfb725c /src/qt | |
| parent | 1f77c5c3e7c02db27d1046d02e4a6129d236b8a8 (diff) | |
| parent | 2e1455c4a100170c322165af3ecbbcd3004b2f9d (diff) | |
Merge #16708: qt: Replace obsolete functions of QSslSocket
2e1455c4a100170c322165af3ecbbcd3004b2f9d Replace obsolete functions of QSslSocket (Hennadii Stepanov)
Pull request description:
The [`QSslSocket::setDefaultCaCertificates()`](https://doc.qt.io/qt-5/qsslsocket-obsolete.html#setDefaultCaCertificates) and [`QSslSocket::systemCaCertificates()`](https://doc.qt.io/qt-5/qsslsocket-obsolete.html#systemCaCertificates) member functions are [obsolete](https://doc.qt.io/qt-5.12/qsslsocket-obsolete.html) since Qt 5.12.
This PR replaces them, does not change behavior and keeps compatibility with [Qt 5.5.1](https://github.com/bitcoin/bitcoin/pull/15393).
ACKs for top commit:
laanwj:
ACK 2e1455c4a100170c322165af3ecbbcd3004b2f9d
promag:
ACK 2e1455c4a100170c322165af3ecbbcd3004b2f9d.
Tree-SHA512: 4182cd22a3e7a998d62a0fe84e748803a6962a65920b74da9fcf5666a700507468bb6e428054ccb70c2fbb7969a56933f450bc405c7a32ecbc1f8af4c1f983a3
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/paymentserver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index f3f5d28af9..0bb87742e9 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -41,8 +41,8 @@ #include <QNetworkReply> #include <QNetworkRequest> #include <QSslCertificate> +#include <QSslConfiguration> #include <QSslError> -#include <QSslSocket> #include <QStringList> #include <QTextDocument> #include <QUrlQuery> @@ -448,9 +448,9 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store) certList = QSslCertificate::fromPath(certFile); // Use those certificates when fetching payment requests, too: - QSslSocket::setDefaultCaCertificates(certList); + QSslConfiguration::defaultConfiguration().setCaCertificates(certList); } else - certList = QSslSocket::systemCaCertificates(); + certList = QSslConfiguration::systemCaCertificates(); int nRootCerts = 0; const QDateTime currentTime = QDateTime::currentDateTime(); |