diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-10 05:01:04 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-10 05:02:49 +0300 |
| commit | 5087e0ced43d813eb6f765913a6fc3958d2a7a9d (patch) | |
| tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp | |
| parent | 8b813e69d7764a1ad320de203fbcf17146ba469b (diff) | |
Import QtWebKit commit f085f528406bf5656ce887e14c47b5e5fde4901d
Change-Id: I9bd682d60cdf85d3cca75faf84fbfd151213d98e
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp')
| -rw-r--r-- | Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index 0da45fbc7..792459558 100644 --- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -41,7 +41,7 @@ #include <QCoreApplication> -#if USE(HTTP2) +#if USE(HTTP2) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0) #include <private/http2protocol_p.h> #include <cstdlib> @@ -62,7 +62,7 @@ ProtocolParameters::ProtocolParameters() QT_END_NAMESPACE -#endif // USE(HTTP2) +#endif // USE(HTTP2) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0) static const int gMaxRedirections = 10; @@ -797,7 +797,7 @@ QNetworkReply* QNetworkReplyHandler::sendNetworkRequest(QNetworkAccessManager* m if (!manager) return 0; -#if USE(HTTP2) +#if USE(HTTP2) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0) static const bool alpnIsSupported = ResourceRequest::alpnIsSupported(); if (alpnIsSupported && !manager->property(Http2::http2ParametersPropertyName).isValid()) { Http2::ProtocolParameters params; |