From b44e67e1ca5766daef3e4f7a6dd433ebe0f744d1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 1 Feb 2012 10:19:07 +0100
Subject: 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>
---
 src/network/kernel/qnetworkproxy_win.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/network/kernel/qnetworkproxy_win.cpp')

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:
-- 
cgit v1.2.3