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>
---
 tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests/auto/network/kernel/qhostaddress')

diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
index 73919ce4df..d74e1b1e89 100644
--- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
+++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
@@ -48,6 +48,9 @@
 #include <qhash.h>
 #include <qbytearray.h>
 #include <qdatastream.h>
+#ifdef Q_OS_WIN
+#  include <qt_windows.h>
+#endif
 
 class tst_QHostAddress : public QObject
 {
-- 
cgit v1.2.3