diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-07-12 14:20:40 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-07-12 12:36:34 +0000 |
| commit | ff11c363b1fbf640c96501142044d1f2cfdea4f0 (patch) | |
| tree | 6d5d0ec7dfbf021cb9f1b5f65b168ad8570ec301 /src/network/access/qhttpnetworkconnection_p.h | |
| parent | ca9ed9619f1c21ba0b3ef7687bbbad9eaf2bd39a (diff) | |
Remove SSL includes from qhttpnetworkconnection_p.h
On Windows, qsslcontext_openssl_p.h pulls in an unsanitized
windows.h, causing the infamous min/max macros to be defined,
requiring a #define NOMINMAX in qhttp2protocolhandler.cpp.
This in turn breaks the MinGW developer build since that has
NOMINMAX globally defined:
access\qhttp2protocolhandler.cpp:40:0: error: "NOMINMAX" redefined [-Werror]
Remove the include, adding missing forward declarations and include
directives to the source files.
Change-Id: Ic1c2c711d87599b15ad6e2d87eae7153a44ace47
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'src/network/access/qhttpnetworkconnection_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection_p.h | 15 |
1 files changed, 4 insertions, 11 deletions
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 |