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>
This commit is contained in:
Friedemann Kleint 2016-07-12 14:20:40 +02:00
parent ca9ed9619f
commit ff11c363b1
4 changed files with 6 additions and 13 deletions

View File

@ -37,8 +37,6 @@
**
****************************************************************************/
#define NOMINMAX
#include "qhttpnetworkconnection_p.h"
#include "qhttp2protocolhandler_p.h"

View File

@ -60,6 +60,7 @@
# include <QtNetwork/qsslkey.h>
# include <QtNetwork/qsslcipher.h>
# include <QtNetwork/qsslconfiguration.h>
# include <QtNetwork/qsslerror.h>
#endif

View File

@ -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

View File

@ -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>