diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-13 01:01:03 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-13 10:13:01 +0100 |
| commit | cccc9d0b95cd021ae93c70867771a57aaadd16ff (patch) | |
| tree | 34948260f68ee30b3ee0f8656d9b518e1438b606 /examples/network/torrent/torrentclient.cpp | |
| parent | 0dc5562fa4f01140e98e55ceaa743b0f4fc276c7 (diff) | |
| parent | 76c4c5d5581b2cd36a043234eb167dd55041301d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
Change-Id: I4d3041fa291a918c774ffa5eb5c8792a0966451d
Diffstat (limited to 'examples/network/torrent/torrentclient.cpp')
| -rw-r--r-- | examples/network/torrent/torrentclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp index 6b11338f42..00f46df892 100644 --- a/examples/network/torrent/torrentclient.cpp +++ b/examples/network/torrent/torrentclient.cpp @@ -867,7 +867,7 @@ void TorrentClient::removeClient() // Remove the host from our list of known peers if the connection // failed. - if (client->peer() && client->error() == QAbstractSocket::ConnectionRefusedError) + if (client->peer() && client->socketError() == QAbstractSocket::ConnectionRefusedError) d->peers.removeAll(client->peer()); // Remove the client from RateController and all structures. |