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

Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76

7 files changed, 12 insertions, 12 deletions

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index be6d1b866a..eec5cfa96d 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -470,7 +470,7 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
         }
         // - Changing values in QAuthenticator will reset the 'phase'. Therefore if it is still "Done"
         //   then nothing was filled in by the user or the cache
-        // - If withCredentials has been set to false (e.g. by QtWebKit for a cross-origin XMLHttpRequest) then
+        // - If withCredentials has been set to false (e.g. by Qt WebKit for a cross-origin XMLHttpRequest) then
         //   we need to bail out if authentication is required.
         if (priv->phase == QAuthenticatorPrivate::Done || !reply->request().withCredentials()) {
             // Reset authenticator so the next request on that channel does not get messed up
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index c4e2b1752d..38723a7032 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -231,7 +231,7 @@ bool QHttpNetworkConnectionChannel::sendRequest()
             url.setUserInfo(QString());
             request.setUrl(url);
         }
-        // Will only be false if QtWebKit is performing a cross-origin XMLHttpRequest
+        // Will only be false if Qt WebKit is performing a cross-origin XMLHttpRequest
         // and withCredentials has not been set to true.
         if (request.withCredentials())
             connection->d_func()->createAuthorization(socket, request);
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index c2c4f0f043..480598918f 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -186,7 +186,7 @@ QNetworkReplyHttpImpl::QNetworkReplyHttpImpl(QNetworkAccessManager* const manage
 
 
     // Internal code that does a HTTP reply for the synchronous Ajax
-    // in QtWebKit.
+    // in Qt WebKit.
     QVariant synchronousHttpAttribute = request.attribute(
             static_cast<QNetworkRequest::Attribute>(QNetworkRequest::SynchronousRequestAttribute));
     if (synchronousHttpAttribute.isValid()) {
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 7f98206e52..e12286c459 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -361,7 +361,7 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const
 
     q->QIODevice::open(QIODevice::ReadOnly);
     // Internal code that does a HTTP reply for the synchronous Ajax
-    // in QtWebKit.
+    // in Qt WebKit.
     QVariant synchronousHttpAttribute = req.attribute(
             static_cast<QNetworkRequest::Attribute>(QNetworkRequest::SynchronousRequestAttribute));
     // The synchronous HTTP is a corner case, we will put all upload data in one big QByteArray in the outgoingDataBuffer.
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index fd76fdbae0..3a3e24b80b 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -204,7 +204,7 @@ QT_BEGIN_NAMESPACE
     \value CookieLoadControlAttribute
         Requests only, type: QMetaType::Int (default: QNetworkRequest::Automatic)
         Indicates whether to send 'Cookie' headers in the request.
-        This attribute is set to false by QtWebKit when creating a cross-origin
+        This attribute is set to false by Qt WebKit when creating a cross-origin
         XMLHttpRequest where withCredentials has not been set explicitly to true by the
         Javascript that created the request.
         See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag}{here} for more information.
@@ -214,7 +214,7 @@ QT_BEGIN_NAMESPACE
         Requests only, type: QMetaType::Int (default: QNetworkRequest::Automatic)
         Indicates whether to save 'Cookie' headers received from the server in reply
         to the request.
-        This attribute is set to false by QtWebKit when creating a cross-origin
+        This attribute is set to false by Qt WebKit when creating a cross-origin
         XMLHttpRequest where withCredentials has not been set explicitly to true by the
         Javascript that created the request.
         See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information.
@@ -226,7 +226,7 @@ QT_BEGIN_NAMESPACE
         if available. If this is set to QNetworkRequest::Manual and the authentication
         mechanism is 'Basic' or 'Digest', Qt will not send an an 'Authorization' HTTP
         header with any cached credentials it may have for the request's URL.
-        This attribute is set to QNetworkRequest::Manual by QtWebKit when creating a cross-origin
+        This attribute is set to QNetworkRequest::Manual by Qt WebKit when creating a cross-origin
         XMLHttpRequest where withCredentials has not been set explicitly to true by the
         Javascript that created the request.
         See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information.
@@ -286,7 +286,7 @@ QT_BEGIN_NAMESPACE
     \since 4.7
 
     Indicates if an aspect of the request's loading mechanism has been
-    manually overridden, e.g. by QtWebKit.
+    manually overridden, e.g. by Qt WebKit.
 
     \value Automatic            default value: indicates default behaviour.
 
@@ -584,7 +584,7 @@ void QNetworkRequest::setSslConfiguration(const QSslConfiguration &config)
     Allows setting a reference to the \a object initiating
     the request.
 
-    For example QtWebKit sets the originating object to the
+    For example Qt WebKit sets the originating object to the
     QWebFrame that initiated the request.
 
     \sa originatingObject()
@@ -1036,7 +1036,7 @@ QDateTime QNetworkHeadersPrivate::fromHttpDate(const QByteArray &value)
         dt = QDateTime::fromString(QString::fromLatin1(value), Qt::TextDate);
     } else {
         // Use sscanf over QLocal/QDateTimeParser for speed reasons. See the
-        // QtWebKit performance benchmarks to get an idea.
+        // Qt WebKit performance benchmarks to get an idea.
         if (pos == 3) {
             char month_name[4];
             int day, year, hour, minute, second;
diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc
index 4fea6f00a9..7c6ba1155f 100644
--- a/src/network/doc/src/ssl.qdoc
+++ b/src/network/doc/src/ssl.qdoc
@@ -73,6 +73,6 @@
     using code from the OpenSSL project are correctly certified for import
     and export in relevant regions of the world.
 
-    When the QtNetwork module is built with SSL support, the library is linked
+    When the Qt Network module is built with SSL support, the library is linked
     against OpenSSL in a way that requires OpenSSL license compliance.
 */
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index f555125392..6fcd977759 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*! \namespace QSsl
 
-    \brief The QSsl namespace declares enums common to all SSL classes in QtNetwork.
+    \brief The QSsl namespace declares enums common to all SSL classes in Qt Network.
     \since 4.3
 
     \ingroup network