Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	config.tests/unix/compile.test
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/testlib/qtestcase.cpp
	src/testlib/qtestcase.qdoc

Change-Id: Ied3c471dbc9a076c8de33d673bd557e88575609d

2 files changed, 8 insertions, 4 deletions

diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index 876e095a0c..3f17b68e79 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -141,10 +141,12 @@ QNetworkReplyPrivate::QNetworkReplyPrivate()
     \value TooManyRedirectsError       while following redirects, the maximum
     limit was reached. The limit is by default set to 50 or as set by
     QNetworkRequest::setMaxRedirectsAllowed().
+    (This value was introduced in 5.6.)
 
     \value InsecureRedirectError       while following redirects, the network
     access API detected a redirect from a encrypted protocol (https) to an
     unencrypted one (http).
+    (This value was introduced in 5.6.)
 
     \value ProxyConnectionRefusedError the connection to the proxy
     server was refused (the proxy server is not accepting requests)
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index f674cd5c2e..2ee85fd049 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -146,11 +146,12 @@ QT_BEGIN_NAMESPACE
         Replies only, type: QMetaType::QUrl (no default)
         If present, it indicates that the server is redirecting the
         request to a different URL. The Network Access API does not by
-        default follow redirections: it's up to the application to
+        default follow redirections: the application can
         determine if the requested redirection should be allowed,
-        according to its security policies. However, if
-        QNetworkRequest::FollowRedirectsAttribute is set, then this attribute
-        will not be present in the reply.
+        according to its security policies, or it can set
+        QNetworkRequest::FollowRedirectsAttribute to true (in which case
+        the redirection will be followed and this attribute will not
+        be present in the reply).
         The returned URL might be relative. Use QUrl::resolved()
         to create an absolute URL out of it.
 
@@ -271,6 +272,7 @@ QT_BEGIN_NAMESPACE
         Indicates whether the Network Access API should automatically follow a
         HTTP redirect response or not. Currently redirects that are insecure,
         that is redirecting from "https" to "http" protocol, are not allowed.
+        (This value was introduced in 5.6.)
 
     \value User
         Special type. Additional information can be passed in