diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:03 +0100 |
| commit | 9c055e8e47d9411a8f34abe6872e4bfd942cc372 (patch) | |
| tree | 895e139477c88a064a993f035afec614de9dafc7 /src/network/access/qhttpnetworkconnection.cpp | |
| parent | d08e0e861acadf3a354d3833dd5623ef71fa7a4b (diff) | |
| parent | 76010f4af8c9a59a20c489d70c7f99b802f9721f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iaec2e57d6bf33355ddfa61d25133580a8740335f
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index d24927b922..517af326a8 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -646,8 +646,8 @@ QHttpNetworkReply* QHttpNetworkConnectionPrivate::queueRequest(const QHttpNetwor #ifndef Q_OS_WINRT // For Happy Eyeballs the networkLayerState is set to Unknown - // untill we have started the first connection attempt. So no - // request will be started untill we know if IPv4 or IPv6 + // until we have started the first connection attempt. So no + // request will be started until we know if IPv4 or IPv6 // should be used. if (networkLayerState == Unknown || networkLayerState == HostLookupPending) { startHostInfoLookup(); |