Merge pull request #11020 from Piccirello/remove_workaround

Remove Qt bug workaround
This commit is contained in:
Mike Tzou 2019-08-06 10:17:52 +08:00 committed by GitHub
commit c65c40a5cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -462,12 +462,6 @@ void AdvancedSettings::loadAdvancedSettings()
bool interfaceExists = currentInterface.isEmpty(); bool interfaceExists = currentInterface.isEmpty();
int i = 1; int i = 1;
for (const QNetworkInterface &iface : asConst(QNetworkInterface::allInterfaces())) { for (const QNetworkInterface &iface : asConst(QNetworkInterface::allInterfaces())) {
// This line fixes a Qt bug => https://bugreports.qt.io/browse/QTBUG-52633
// Tested in Qt 5.6.0. For more info see:
// https://github.com/qbittorrent/qBittorrent/issues/5131
// https://github.com/qbittorrent/qBittorrent/pull/5135
if (iface.addressEntries().isEmpty()) continue;
m_comboBoxInterface.addItem(iface.humanReadableName(), iface.name()); m_comboBoxInterface.addItem(iface.humanReadableName(), iface.name());
if (!currentInterface.isEmpty() && (iface.name() == currentInterface)) { if (!currentInterface.isEmpty() && (iface.name() == currentInterface)) {
m_comboBoxInterface.setCurrentIndex(i); m_comboBoxInterface.setCurrentIndex(i);