summaryrefslogtreecommitdiffstats
path: root/src/libs/kdtools/kdupdaterfiledownloader.cpp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-09-09 15:31:56 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-09-09 15:32:37 +0200
commit5cc89ac1eab55dfbd8a1ad754cbb2c8f7c424abc (patch)
tree4ceabf59d7c97e5f3c1ad33edc09110b7b29b10b /src/libs/kdtools/kdupdaterfiledownloader.cpp
parentd8d93f85d6362e8cfb24a076e3df0504cb93957f (diff)
parentdc3a3ec7fe2bd0393684d75419a2f502e836a749 (diff)
Merge remote-tracking branch 'origin/1.4'
Diffstat (limited to 'src/libs/kdtools/kdupdaterfiledownloader.cpp')
-rw-r--r--src/libs/kdtools/kdupdaterfiledownloader.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libs/kdtools/kdupdaterfiledownloader.cpp b/src/libs/kdtools/kdupdaterfiledownloader.cpp
index 19ba204c0..95b574b2f 100644
--- a/src/libs/kdtools/kdupdaterfiledownloader.cpp
+++ b/src/libs/kdtools/kdupdaterfiledownloader.cpp
@@ -979,6 +979,12 @@ void KDUpdater::HttpDownloader::httpReqFinished()
void KDUpdater::HttpDownloader::httpReadProgress(qint64 done, qint64 total)
{
+ if (d->http) {
+ const QUrl redirectUrl = d->http->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
+ if (followRedirects() && redirectUrl.isValid())
+ return; // if we are a redirection, do not emit the progress
+ }
+
setProgress(done, total);
emit downloadProgress(calcProgress(done, total));
}