diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-14 07:27:10 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-14 08:33:21 (GMT) |
| commit | 503c48853eefe547631c425e9acad810b76e61fe (patch) | |
| tree | 5392090596f9f1075e576854d3a8fa065a367ef6 /src/network | |
| parent | f23fa541a04abd1ddc36815a285ec824d5b5c5e0 (diff) | |
| download | Qt-503c48853eefe547631c425e9acad810b76e61fe.zip Qt-503c48853eefe547631c425e9acad810b76e61fe.tar.gz Qt-503c48853eefe547631c425e9acad810b76e61fe.tar.bz2 | |
Build fix for mingw
we should include qt_windows.h and not windows.h because we have to
define WINVER to 0x500.
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkinterface_win_p.h | 2 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkinterface_win_p.h b/src/network/kernel/qnetworkinterface_win_p.h index c4dff76..15b4859 100644 --- a/src/network/kernel/qnetworkinterface_win_p.h +++ b/src/network/kernel/qnetworkinterface_win_p.h @@ -54,7 +54,7 @@ // #include <winsock2.h> -#include <windows.h> +#include <qt_windows.h> #include <time.h> QT_BEGIN_NAMESPACE diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index 7052bcc2..9fab545 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -49,7 +49,7 @@ #include <qurl.h> #include <string.h> -#include <windows.h> +#include <qt_windows.h> #include <wininet.h> /* diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index a38433b..7dc9fab 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -57,7 +57,7 @@ #include "qsslsocket_p.h" #ifdef Q_OS_WIN -#include <windows.h> +#include <qt_windows.h> #if defined(OCSP_RESPONSE) #undef OCSP_RESPONSE #endif |