diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-14 08:09:31 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-14 08:31:10 +0000 |
| commit | 318f728283c08ffb93c7469f671b43a010c57e0d (patch) | |
| tree | 97263966156bab079aaa8b74885a1657e3a960e8 /src/network/access/qhttpnetworkconnection.cpp | |
| parent | a3447586402a1ca6f40cb6676272f956e5d64431 (diff) | |
| parent | 9c055e8e47d9411a8f34abe6872e4bfd942cc372 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
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(); |