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-23 05:27:06 +0000 |
| commit | 81ba148fc9ba9b71e261d46c500290690ee2ec63 (patch) | |
| tree | 72b027ed57f526b150f94d03c641e840c2bcece7 | |
| parent | 5c2df2efa3b979108f6d9661de4738932e4ca894 (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.
Change-Id: I82cd8b21d263102000e6e66f135465bc2c126db4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 29a7489769bca59630782061789561fb07d77892)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
4 files changed, 4 insertions, 3 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" diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 5524129418..1457e5048d 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" @@ -75,8 +76,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 af32c191c3..e7a5fb300d 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" |