summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttpnetworkconnectionchannel.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-28 11:07:32 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-28 11:10:29 +0100
commit02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch)
tree156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/network/access/qhttpnetworkconnectionchannel.cpp
parentbf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff)
parent0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel.cpp')
-rw-r--r--src/network/access/qhttpnetworkconnectionchannel.cpp2
1 files changed, 1 insertions, 1 deletions
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);