d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17045 from Chocobo1/cleanup

Browse Source 
Fix compilation with qmake
This commit is contained in:
Chocobo1 2022-05-17 13:14:29 +08:00 committed by GitHub
commit 5af96943e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/base/utils/net.cpp
View File

@ -87,11 +87,11 @@ namespace Utils
protocolEquivalentAddress = QHostAddress(addr.toIPv4Address(&addrConversionOk)); protocolEquivalentAddress = QHostAddress(addr.toIPv4Address(&addrConversionOk));
} }
for (const Subnet &subnet : subnets) return std::any_of(subnets.begin(), subnets.end(), [&](const Subnet &subnet)
if (addr.isInSubnet(subnet) || (addrConversionOk && protocolEquivalentAddress.isInSubnet(subnet))) {
return true; return addr.isInSubnet(subnet)
|| (addrConversionOk && protocolEquivalentAddress.isInSubnet(subnet));
return false; });
} }
QString subnetToString(const Subnet &subnet) QString subnetToString(const Subnet &subnet)
@ -133,9 +133,11 @@ namespace Utils
QList<QSslCertificate> loadSSLCertificate(const QByteArray &data) QList<QSslCertificate> loadSSLCertificate(const QByteArray &data)
{ {
const QList<QSslCertificate> certs {QSslCertificate::fromData(data)}; const QList<QSslCertificate> certs {QSslCertificate::fromData(data)};
if (std::any_of(certs.cbegin(), certs.cend(), [](const QSslCertificate &c) { return c.isNull(); })) const bool hasInvalidCerts = std::any_of(certs.cbegin(), certs.cend(), [](const QSslCertificate &cert)
return {}; {
return certs; return cert.isNull();
});
return hasInvalidCerts ? QList<QSslCertificate>() : certs;
} }
bool isSSLCertificatesValid(const QByteArray &data) bool isSSLCertificatesValid(const QByteArray &data)
@ -146,7 +148,7 @@ namespace Utils
QSslKey loadSSLKey(const QByteArray &data) QSslKey loadSSLKey(const QByteArray &data)
{ {
// try different formats // try different formats
QSslKey key {data, QSsl::Rsa}; const QSslKey key {data, QSsl::Rsa};
if (!key.isNull()) if (!key.isNull())
return key; return key;
return {data, QSsl::Ec}; return {data, QSsl::Ec};

2
src/gui/gui.pri
View File

@ -197,12 +197,10 @@ FORMS += \
RESOURCES += $$PWD/about.qrc RESOURCES += $$PWD/about.qrc
stacktrace { stacktrace {
!unix {
HEADERS += $$PWD/stacktracedialog.h HEADERS += $$PWD/stacktracedialog.h
SOURCES += $$PWD/stacktracedialog.cpp SOURCES += $$PWD/stacktracedialog.cpp
FORMS += $$PWD/stacktracedialog.ui FORMS += $$PWD/stacktracedialog.ui
} }
}
win32|macx { win32|macx {
HEADERS += $$PWD/programupdater.h HEADERS += $$PWD/programupdater.h