mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-27 03:39:39 +03:00
Code Issues Projects Releases Packages 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));
}
for (const Subnet &subnet : subnets)
if (addr.isInSubnet(subnet) || (addrConversionOk && protocolEquivalentAddress.isInSubnet(subnet)))
return true;
return false;
return std::any_of(subnets.begin(), subnets.end(), [&](const Subnet &subnet)
{
return addr.isInSubnet(subnet)
|| (addrConversionOk && protocolEquivalentAddress.isInSubnet(subnet));
});
}
QString subnetToString(const Subnet &subnet)
@ -133,9 +133,11 @@ namespace Utils
QList<QSslCertificate> loadSSLCertificate(const QByteArray &data)
{
const QList<QSslCertificate> certs {QSslCertificate::fromData(data)};
if (std::any_of(certs.cbegin(), certs.cend(), [](const QSslCertificate &c) { return c.isNull(); }))
return {};
return certs;
const bool hasInvalidCerts = std::any_of(certs.cbegin(), certs.cend(), [](const QSslCertificate &cert)
{
return cert.isNull();
});
return hasInvalidCerts ? QList<QSslCertificate>() : certs;
}
bool isSSLCertificatesValid(const QByteArray &data)
@ -146,7 +148,7 @@ namespace Utils
QSslKey loadSSLKey(const QByteArray &data)
{
// try different formats
QSslKey key {data, QSsl::Rsa};
const QSslKey key {data, QSsl::Rsa};
if (!key.isNull())
return key;
return {data, QSsl::Ec};

8
src/gui/gui.pri
View file

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