Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I84097f8e7b3b2128028bd7693c913d6968b82bfe

1 files changed, 7 insertions, 7 deletions

diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index 06c895af5f6..68d4ae6d6b1 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -91,7 +91,7 @@ public:
         HTTP2AllowedAttribute,
         HTTP2WasUsedAttribute,
         OriginalContentLengthAttribute,
-        RedirectsPolicyAttribute,
+        RedirectPolicyAttribute,
 
         User = 1000,
         UserMax = 32767
@@ -113,11 +113,11 @@ public:
         LowPriority = 5
     };
 
-    enum RedirectsPolicy {
-        ManualRedirectsPolicy,
-        NoLessSafeRedirectsPolicy,
-        SameOriginRedirectsPolicy,
-        UserVerifiedRedirectsPolicy
+    enum RedirectPolicy {
+        ManualRedirectPolicy,
+        NoLessSafeRedirectPolicy,
+        SameOriginRedirectPolicy,
+        UserVerifiedRedirectPolicy
     };
 
 
@@ -177,6 +177,6 @@ Q_DECLARE_SHARED(QNetworkRequest)
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QNetworkRequest)
-Q_DECLARE_METATYPE(QNetworkRequest::RedirectsPolicy)
+Q_DECLARE_METATYPE(QNetworkRequest::RedirectPolicy)
 
 #endif