diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-04-07 15:05:45 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-04-07 15:11:03 (GMT) |
| commit | 76608a9c51f4cd5309a5fec1af40c4d80089adf5 (patch) | |
| tree | 65b7c3f118509660c7932c69bdead58a8993ccbd /src/network/access | |
| parent | 35c26d696cbff269d551c012a212c09692dd6f6b (diff) | |
| download | Qt-76608a9c51f4cd5309a5fec1af40c4d80089adf5.zip Qt-76608a9c51f4cd5309a5fec1af40c4d80089adf5.tar.gz Qt-76608a9c51f4cd5309a5fec1af40c4d80089adf5.tar.bz2 | |
Fix compilation if SSL is not enabled.
Using #ifndef QT_NO_OPENSSL without first #include'ing something will
never work. Which means we always include qsslsocket.h. The problem
is: if OpenSSL isn't enabled, then that file is a no-op and we never
include qabstractsocket.h.
Reviewed-by: Markus Goetz
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qhttpnetworkreply_p.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index 21f4116..c17c65c 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -66,12 +66,10 @@ static const unsigned char gz_magic[2] = {0x1f, 0x8b}; // gzip magic header #define CHUNK 16384 #endif -#ifndef QT_NO_OPENSSL -# include <QtNetwork/qsslsocket.h> -# include <QtNetwork/qsslerror.h> -#else -# include <QtNetwork/qtcpsocket.h> -#endif +#include <QtNetwork/qtcpsocket.h> +// it's safe to include these even if SSL support is not enabled +#include <QtNetwork/qsslsocket.h> +#include <QtNetwork/qsslerror.h> #include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkreply.h> |