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/corelib/io/qsettings_p.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/corelib/io/qsettings_p.h')

diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h
index e53ca24669..f4f285bae4 100644
--- a/src/corelib/io/qsettings_p.h
+++ b/src/corelib/io/qsettings_p.h
@@ -64,10 +64,6 @@
 #endif
 #include "private/qscopedpointer_p.h"
 
-#ifdef Q_OS_WIN
-#include "QtCore/qt_windows.h"
-#endif
-
 QT_BEGIN_NAMESPACE
 
 #define QT_QSETTINGS_ALWAYS_CASE_SENSITIVE_AND_FORGET_ORIGINAL_KEY_ORDER
-- 
cgit v1.2.3