diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-15 01:00:59 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-15 10:14:05 +0100 |
commit | d14fd32d403bd8d120fbe92dae06e9cb187c01c8 (patch) | |
tree | fbcae21f765b48e0359f9fb303554172caa5a83c /examples/network/downloadmanager/downloadmanager.cpp | |
parent | 96dea48c154e5971593582f92917db3b3f17c7fa (diff) | |
parent | 2cbc5f6f7ae8ba580126a7cafc1898377c2a2407 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/network/access/spdy/tst_spdy.cpp
Change-Id: I3196c5f7b34f2ffc9ef1e690d02d5b9bb3270a74
Diffstat (limited to 'examples/network/downloadmanager/downloadmanager.cpp')
-rw-r--r-- | examples/network/downloadmanager/downloadmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/downloadmanager/downloadmanager.cpp b/examples/network/downloadmanager/downloadmanager.cpp index cbad29541a..eceb48977b 100644 --- a/examples/network/downloadmanager/downloadmanager.cpp +++ b/examples/network/downloadmanager/downloadmanager.cpp @@ -162,7 +162,7 @@ void DownloadManager::downloadFinished() progressBar.clear(); output.close(); - if (currentDownload->error()) { + if (currentDownload->networkError()) { // download failed fprintf(stderr, "Failed: %s\n", qPrintable(currentDownload->errorString())); output.remove(); |