diff options
| author | Volker Hilsheimer <[email protected]> | 2022-02-21 23:31:08 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <[email protected]> | 2022-02-22 14:48:38 +0100 |
| commit | 29a7489769bca59630782061789561fb07d77892 (patch) | |
| tree | 4f9ee8b489f094affbc4755a4da3ea1f78aa99b9 | |
| 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 <[email protected]>
4 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp index a31477ded9d..e092dcc81fc 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 e074f87eb45..8f07ab6aa08 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" diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index e8399bd3d25..89d55e9b482 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -43,6 +43,7 @@ #define _WIN32_WINNT 0x0A00 #endif +#include <QtCore/qt_windows.h> #include "qwindowscombase.h" #include "qwindowsdialoghelpers.h" @@ -74,8 +75,6 @@ #include <algorithm> #include <vector> -#include <QtCore/qt_windows.h> - // #define USE_NATIVE_COLOR_DIALOG /* Testing purposes only */ QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp index af32c191c30..e7a5fb300db 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.cpp +++ b/src/plugins/platforms/windows/qwindowsdrag.cpp @@ -37,6 +37,7 @@ ** ****************************************************************************/ +#include <QtCore/qt_windows.h> #include "qwindowsdrag.h" #include "qwindowscontext.h" #include "qwindowsscreen.h" @@ -45,7 +46,6 @@ #endif #include "qwindowsintegration.h" #include "qwindowsdropdataobject.h" -#include <QtCore/qt_windows.h> #include "qwindowswindow.h" #include "qwindowsmousehandler.h" #include "qwindowscursor.h" |