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/qhttpnetworkconnection.cpp | |
| parent | 2b4078cbb0d6bde9a681d1b3120aa586ab6c162d (diff) | |
| parent | 4c0a363a9a0b73c68fd252cba705396d4378b209 (diff) | |
Merge 5.9 into 5.9.5
Change-Id: I327bacd544f874da37c4e0740af0c7854d74a913
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 5bc5f22fef..2301920bdb 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -53,8 +53,6 @@ #include <qpair.h> #include <qdebug.h> -#ifndef QT_NO_HTTP - #ifndef QT_NO_SSL # include <private/qsslsocket_p.h> # include <QtNetwork/qsslkey.h> @@ -1504,5 +1502,3 @@ void QHttpNetworkConnectionPrivate::emitProxyAuthenticationRequired(const QHttpN QT_END_NAMESPACE #include "moc_qhttpnetworkconnection_p.cpp" - -#endif // QT_NO_HTTP |