diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-02-10 20:39:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-10 20:39:02 +0000 |
| commit | 095dbc494c6cb9815b0d9b521a3105b06f4bef33 (patch) | |
| tree | ec5b2ac5777406a533e820f21b5705b209855a0d /src/network/access/qnetworkrequest.cpp | |
| parent | 0b48fcee709ac0070d7b9213632edeafeeddc9e1 (diff) | |
| parent | 32b506d1db1f8cee748a27b548ba8208f2928058 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/network/access/qnetworkrequest.cpp')
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 99f72a7955..1d7c5bec51 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -308,7 +308,7 @@ QT_BEGIN_NAMESPACE was specified, QNetworkAccessManager gives up, without attempting to fall back to HTTP/1.1. If both HTTP2AllowedAttribute and Http2DirectAttribute are set, Http2DirectAttribute takes priority. - (This value was introduced in 5.10.) + (This value was introduced in 5.11.) \omitvalue ResourceTypeAttribute |