diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-01 10:19:07 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 11:06:19 +0100 |
| commit | b44e67e1ca5766daef3e4f7a6dd433ebe0f744d1 (patch) | |
| tree | fd10ab1e36f4b0c2c6b8d2061ae3dc71c508ba7b /src/network | |
| parent | 9fa4e51dbb8cac4f7f5a6bee6e1b9b029b57f393 (diff) | |
Windows: Fix inclusion of <windows.h>
- Always use <qt_windows.h> as the last file to be included.
- Remove it from some headers, use Qt::HANDLE instead of HANDLE.
- Clean up #ifdef, use Q_OS_WIN for Windows/Windows CE.
- Add NOMINMAX to qt_windows.h to avoid problems with the
min/max macros.
- Remove <windows.h> from qplatformdefs.h (VS2005)
Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qdnslookup_win.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/network/kernel/qdnslookup_win.cpp b/src/network/kernel/qdnslookup_win.cpp index 97a82de43c..ba97e64942 100644 --- a/src/network/kernel/qdnslookup_win.cpp +++ b/src/network/kernel/qdnslookup_win.cpp @@ -45,7 +45,7 @@ #include <private/qmutexpool_p.h> #include <private/qsystemlibrary_p.h> -#include <windows.h> +#include <qt_windows.h> #include <windns.h> QT_BEGIN_NAMESPACE diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index a4708e1ecc..6969a9effd 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -47,11 +47,11 @@ #include <qstringlist.h> #include <qregexp.h> #include <qurl.h> +#include <private/qsystemlibrary_p.h> #include <string.h> #include <qt_windows.h> #include <wininet.h> -#include <private/qsystemlibrary_p.h> /* * Information on the WinHTTP DLL: diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index ca9d0f6864..44114481df 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE typedef OSStatus (*PtrSecTrustSettingsCopyCertificates)(int, CFArrayRef*); typedef OSStatus (*PtrSecTrustCopyAnchorCertificates)(CFArrayRef*); #elif defined(Q_OS_WIN) -#include <windows.h> +#include <QtCore/qt_windows.h> #include <wincrypt.h> #ifndef HCRYPTPROV_LEGACY #define HCRYPTPROV_LEGACY HCRYPTPROV |