QQuickFontLoader: 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: I4464c65967aac193e71875abacb4a32c1c70d606
Reviewed-by: Ulf Hermann <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Shawn Rutledge <[email protected]>

1 files changed, 0 insertions, 17 deletions

diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index e489a5f4ac..94bda90d5d 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -28,8 +28,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#define FONTLOADER_MAXIMUM_REDIRECT_RECURSION 16
-
 class QQuickFontObject : public QObject
 {
 Q_OBJECT
@@ -44,7 +42,6 @@ Q_SIGNALS:
     void fontDownloaded(int id);
 
 private:
-    int redirectCount = 0;
     QNetworkReply *reply = nullptr;
 
 private Q_SLOTS:
@@ -74,20 +71,6 @@ void QQuickFontObject::download(const QUrl &url, QNetworkAccessManager *manager)
 void QQuickFontObject::replyFinished()
 {
     if (reply) {
-        redirectCount++;
-        if (redirectCount < FONTLOADER_MAXIMUM_REDIRECT_RECURSION) {
-            QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-            if (redirect.isValid()) {
-                QUrl url = reply->url().resolved(redirect.toUrl());
-                QNetworkAccessManager *manager = reply->manager();
-                reply->deleteLater();
-                reply = nullptr;
-                download(url, manager);
-                return;
-            }
-        }
-        redirectCount = 0;
-
         if (!reply->error()) {
             id = QFontDatabase::addApplicationFontFromData(reply->readAll());
             emit fontDownloaded(id);