highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-01 19:35:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui: Remove QT_VERSION fallbacks for Qt < 5

Browse Source 
There were surprisingly many `#ifdef` fallbacks for Qt 4.

Remiving them simplifies maintenance, as well as adding new GUI
functionality.
This commit is contained in:
Wladimir J. van der Laan
2018-06-13 16:02:39 +02:00
parent bad068ad9f
commit 907f73bbc5
23 changed files with 8 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/paymentrequestplus.cpp
View File

@@ -97,12 +97,10 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
qWarning() << "PaymentRequestPlus::getMerchant: Payment request: certificate expired or not yet active: " << qCert;
return false;
}
#if QT_VERSION >= 0x050000
if (qCert.isBlacklisted()) {
qWarning() << "PaymentRequestPlus::getMerchant: Payment request: certificate blacklisted: " << qCert;
return false;
}
#endif
const unsigned char *data = (const unsigned char *)certChain.certificate(i).data();
X509 *cert = d2i_X509(nullptr, &data, certChain.certificate(i).size());
if (cert)