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/gui/painting/qpaintengine_raster.cpp | |
| 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/gui/painting/qpaintengine_raster.cpp')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 4a1a1f041f..f2aac442dc 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -71,17 +71,17 @@ // #include "qbezier_p.h" #include "qoutlinemapper_p.h" -#if defined(Q_OS_WIN) -# include <qt_windows.h> +#include <limits.h> + +#ifdef Q_OS_WIN # include <qvarlengtharray.h> # include <private/qfontengine_p.h> +# include <qt_windows.h> +#ifdef Q_OS_WIN64 +# include <malloc.h> +# endif #endif -#if defined(Q_OS_WIN64) -# include <malloc.h> -#endif -#include <limits.h> - QT_BEGIN_NAMESPACE Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp |