Windows: Fix inclusion of <windows.h>
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Wed, 1 Feb 2012 09:19:07 +0000 (10:19 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 1 Feb 2012 10:06:19 +0000 (11:06 +0100)
commitb44e67e1ca5766daef3e4f7a6dd433ebe0f744d1
treefd10ab1e36f4b0c2c6b8d2061ae3dc71c508ba7b
parent9fa4e51dbb8cac4f7f5a6bee6e1b9b029b57f393
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>
54 files changed:
mkspecs/win32-msvc2005/qplatformdefs.h
src/corelib/animation/qabstractanimation_p.h
src/corelib/codecs/qtextcodec.cpp
src/corelib/global/qt_windows.h
src/corelib/io/qfilesystemmetadata_p.h
src/corelib/io/qfilesystemwatcher_win.cpp
src/corelib/io/qfilesystemwatcher_win_p.h
src/corelib/io/qprocess.h
src/corelib/io/qsettings.cpp
src/corelib/io/qsettings_p.h
src/corelib/io/qsettings_win.cpp
src/corelib/io/qtemporarydir.cpp
src/corelib/io/qwindowspipereader_p.h
src/corelib/kernel/qcoreapplication_win.cpp
src/corelib/kernel/qcorecmdlineargs_p.h
src/corelib/kernel/qsharedmemory.cpp
src/corelib/kernel/qsharedmemory_p.h
src/corelib/kernel/qsharedmemory_win.cpp
src/corelib/kernel/qsystemerror.cpp
src/corelib/kernel/qsystemsemaphore_p.h
src/corelib/kernel/qsystemsemaphore_win.cpp
src/corelib/plugin/qlibrary_p.h
src/corelib/plugin/qlibrary_win.cpp
src/corelib/plugin/qsystemlibrary_p.h
src/corelib/thread/qmutex_p.h
src/corelib/thread/qmutex_win.cpp
src/corelib/thread/qthread.cpp
src/corelib/thread/qthread_p.h
src/corelib/thread/qwaitcondition_win.cpp
src/corelib/tools/qdatetime.cpp
src/corelib/tools/qelapsedtimer_win.cpp
src/corelib/tools/qlocale.cpp
src/corelib/tools/qlocale_win.cpp
src/corelib/tools/qsimd.cpp
src/corelib/tools/qsimd_p.h
src/corelib/tools/qstring.cpp
src/gui/image/qpixmap_win.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/network/kernel/qdnslookup_win.cpp
src/network/kernel/qnetworkproxy_win.cpp
src/network/ssl/qsslsocket_p.h
src/printsupport/kernel/qprintengine_win_p.h
src/widgets/dialogs/qfiledialog.cpp
src/widgets/dialogs/qfiledialog_p.h
src/widgets/dialogs/qfilesystemmodel.cpp
src/widgets/dialogs/qwizard_win_p.h
src/widgets/itemviews/qfileiconprovider.cpp
src/widgets/kernel/qapplication_qpa.cpp
src/widgets/kernel/qwidget.cpp
src/widgets/widgets/qabstractscrollarea.cpp
src/widgets/widgets/qsizegrip.cpp
src/widgets/widgets/qwidgetresizehandler.cpp
tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp