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/widgets/itemviews | |
| 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/widgets/itemviews')
| -rw-r--r-- | src/widgets/itemviews/qfileiconprovider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp index 0da942eba0..dd52aebea5 100644 --- a/src/widgets/itemviews/qfileiconprovider.cpp +++ b/src/widgets/itemviews/qfileiconprovider.cpp @@ -46,6 +46,9 @@ #include <qapplication.h> #include <qdir.h> #include <qpixmapcache.h> +#include <private/qfunctions_p.h> +#include <private/qguiplatformplugin_p.h> + #if defined(Q_OS_WIN) # define _WIN32_IE 0x0500 # include <qt_windows.h> @@ -56,9 +59,6 @@ # include <private/qt_cocoa_helpers_mac_p.h> #endif -#include <private/qfunctions_p.h> -#include <private/qguiplatformplugin_p.h> - #if defined(Q_WS_X11) && !defined(Q_NO_STYLE_GTK) # include <private/qgtkstyle_p.h> # include <private/qt_x11_p.h> |