diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-02-21 23:31:08 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-02-22 14:48:38 +0100 |
| commit | 29a7489769bca59630782061789561fb07d77892 (patch) | |
| tree | 4f9ee8b489f094affbc4755a4da3ea1f78aa99b9 /src/plugins/platforms/direct2d | |
| parent | 66203133e3d68f91a63a8257d736596dceab4e01 (diff) | |
Always include qt_windows header first
qt_windows takes care of setting NOMINMAX, which prevents native headers
from defining `min` and `max` as macros, breaking the build. So include
that header always as the first header.
Pick-to: 6.3
Change-Id: I82cd8b21d263102000e6e66f135465bc2c126db4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/platforms/direct2d')
| -rw-r--r-- | src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp index a31477ded9..e092dcc81f 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp @@ -37,6 +37,7 @@ ** ****************************************************************************/ +#include <QtCore/qt_windows.h> #include "qwindowsdirect2dcontext.h" #include "qwindowsdirect2dhelpers.h" #include "qwindowsdirect2dintegration.h" diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp index e074f87eb4..8f07ab6aa0 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp @@ -37,6 +37,7 @@ ** ****************************************************************************/ +#include <QtCore/qt_windows.h> #include "qwindowsdirect2dcontext.h" #include "qwindowsdirect2dintegration.h" #include "qwindowsdirect2dbackingstore.h" |