diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-14 11:54:14 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-14 11:54:14 +0100 |
| commit | 38b20a433d9a565b054930641368f8e4cd47ee29 (patch) | |
| tree | ee70d571e1505291119e76c497fffc5adc89d206 /src/network/access/qhttpthreaddelegate.cpp | |
| parent | 2b4078cbb0d6bde9a681d1b3120aa586ab6c162d (diff) | |
| parent | 4c0a363a9a0b73c68fd252cba705396d4378b209 (diff) | |
Merge 5.9 into 5.9.5
Change-Id: I327bacd544f874da37c4e0740af0c7854d74a913
Diffstat (limited to 'src/network/access/qhttpthreaddelegate.cpp')
| -rw-r--r-- | src/network/access/qhttpthreaddelegate.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 9d874b4d94..c45eb65e5a 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -49,8 +49,6 @@ #include "private/qnetworkaccesscache_p.h" #include "private/qnoncontiguousbytedevice_p.h" -#ifndef QT_NO_HTTP - QT_BEGIN_NAMESPACE static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const QUrl &url) @@ -754,6 +752,4 @@ void QHttpThreadDelegate::synchronousProxyAuthenticationRequiredSlot(const QNet #endif -#endif // QT_NO_HTTP - QT_END_NAMESPACE |