diff options
| author | Vladimir Belyavsky <belyavskyv@gmail.com> | 2023-06-13 19:47:47 +0300 |
|---|---|---|
| committer | Vladimir Belyavsky <belyavskyv@gmail.com> | 2023-06-15 18:48:28 +0300 |
| commit | 348eaf6b2abcff6ec3c835b706fb114ea80995e3 (patch) | |
| tree | 7a7cb792669abe032759ae0e340604562e3cf287 | |
| parent | 7ec2b3da95c9652d38198d4b4780fbd42b00e606 (diff) | |
QQuickAnimatedImage: get rid of manual processing of HTTP redirects
Since d12afeff4097dd78f1311511e0c8f74e1a810d47 (Qt 6.0) QNAM has started
internal processing of HTTP redirects by default. So it seems we can
simply get rid of manual processing of HTTP redirects on Qt Quick level.
Moreover it looks like we never even reached this code since Qt 6.0.
Change-Id: Ibd4133596bf32ee6506b8de23016e2cc9246d037
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -rw-r--r-- | src/quick/items/qquickanimatedimage.cpp | 17 | ||||
| -rw-r--r-- | src/quick/items/qquickanimatedimage_p_p.h | 1 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp index 84ffd89db7..4185986dba 100644 --- a/src/quick/items/qquickanimatedimage.cpp +++ b/src/quick/items/qquickanimatedimage.cpp @@ -328,28 +328,13 @@ void QQuickAnimatedImage::load() } } -#define ANIMATEDIMAGE_MAXIMUM_REDIRECT_RECURSION 16 - void QQuickAnimatedImage::movieRequestFinished() { Q_D(QQuickAnimatedImage); #if QT_CONFIG(qml_network) - if (d->reply) { - d->redirectCount++; - if (d->redirectCount < ANIMATEDIMAGE_MAXIMUM_REDIRECT_RECURSION) { - QVariant redirect = d->reply->attribute(QNetworkRequest::RedirectionTargetAttribute); - if (redirect.isValid()) { - QUrl url = d->reply->url().resolved(redirect.toUrl()); - d->reply->deleteLater(); - setSource(url); - return; - } - } - - d->redirectCount=0; + if (d->reply) d->setMovie(new QMovie(d->reply)); - } #endif if (!d->movie || !d->movie->isValid()) { diff --git a/src/quick/items/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h index a6532e4616..1bd5729b93 100644 --- a/src/quick/items/qquickanimatedimage_p_p.h +++ b/src/quick/items/qquickanimatedimage_p_p.h @@ -49,7 +49,6 @@ public: #if QT_CONFIG(qml_network) QNetworkReply *reply = nullptr; - int redirectCount = 0; #endif bool playing : 1; |