diff options
Diffstat (limited to 'src/network/access')
-rw-r--r-- | src/network/access/qhttp2protocolhandler.cpp | 2 | ||||
-rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 1 | ||||
-rw-r--r-- | src/network/access/qhttpnetworkconnection_p.h | 15 | ||||
-rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 1 |
4 files changed, 6 insertions, 13 deletions
diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp index 6a0aae9693..5bbff9ea29 100644 --- a/src/network/access/qhttp2protocolhandler.cpp +++ b/src/network/access/qhttp2protocolhandler.cpp @@ -37,8 +37,6 @@ ** ****************************************************************************/ -#define NOMINMAX - #include "qhttpnetworkconnection_p.h" #include "qhttp2protocolhandler_p.h" diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index e62d662b52..09cea8e769 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -60,6 +60,7 @@ # include <QtNetwork/qsslkey.h> # include <QtNetwork/qsslcipher.h> # include <QtNetwork/qsslconfiguration.h> +# include <QtNetwork/qsslerror.h> #endif diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 4d1bdb74c4..cad0ab1ac4 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -72,17 +72,6 @@ #ifndef QT_NO_HTTP -#ifndef QT_NO_SSL -#ifndef QT_NO_OPENSSL -# include <private/qsslcontext_openssl_p.h> -#endif -# include <private/qsslsocket_p.h> -# include <QtNetwork/qsslsocket.h> -# include <QtNetwork/qsslerror.h> -#else -# include <QtNetwork/qtcpsocket.h> -#endif - QT_BEGIN_NAMESPACE class QHttpNetworkRequest; @@ -90,6 +79,10 @@ class QHttpNetworkReply; class QHttpThreadDelegate; class QByteArray; class QHostInfo; +#ifndef QT_NO_SSL +class QSslConfiguration; +class QSslContext; +#endif // !QT_NO_SSL class QHttpNetworkConnectionPrivate; class Q_AUTOTEST_EXPORT QHttpNetworkConnection : public QObject diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 791a7495c0..3a780f636b 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -52,6 +52,7 @@ #include <private/qspdyprotocolhandler_p.h> #ifndef QT_NO_SSL +# include <private/qsslsocket_p.h> # include <QtNetwork/qsslkey.h> # include <QtNetwork/qsslcipher.h> # include <QtNetwork/qsslconfiguration.h> |