New upstream version 3.9.1

[minitube] / lib / http / src / networkhttpreply.cpp

diff --git a/lib/http/src/networkhttpreply.cpp b/lib/http/src/networkhttpreply.cpp
index c27d77da597e8cb9e14457a32bb7d53e4e367efb..08b17351c135eb9f9be45659b1d08ecbb0165aeb 100644 (file)
--- a/lib/http/src/networkhttpreply.cpp
+++ b/lib/http/src/networkhttpreply.cpp
@@ -18,8 +18,13 @@ NetworkHttpReply::NetworkHttpReply(const HttpRequest &req, Http &http)
 }
 
 void NetworkHttpReply::setupReply() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    connect(networkReply, &QNetworkReply::errorOccurred, this, &NetworkHttpReply::replyError,
+            Qt::UniqueConnection);
+#else
     connect(networkReply, SIGNAL(error(QNetworkReply::NetworkError)),
             SLOT(replyError(QNetworkReply::NetworkError)), Qt::UniqueConnection);
+#endif
     connect(networkReply, SIGNAL(finished()), SLOT(replyFinished()), Qt::UniqueConnection);
     connect(networkReply, SIGNAL(downloadProgress(qint64, qint64)),
             SLOT(downloadProgress(qint64, qint64)), Qt::UniqueConnection);
@@ -54,6 +59,7 @@ void NetworkHttpReply::emitFinished() {
 }
 
 void NetworkHttpReply::replyFinished() {
+#if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
     QUrl redirection = networkReply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
     if (redirection.isValid()) {
         HttpRequest redirectReq;
@@ -71,6 +77,7 @@ void NetworkHttpReply::replyFinished() {
         readTimeoutTimer->start();
         return;
     }
+#endif
 
     if (isSuccessful()) {
         bytes = networkReply->readAll();