diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-02-21 23:31:08 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-22 13:48:49 +0000 |
| commit | f0c513c230cb85165439ad551f11230b9f9cd0ae (patch) | |
| tree | 1fa1e4edeeaff9bdd6301088c6a78824ff2449bd /src/plugins/platforms | |
| parent | 0f8a5416c0a8d1d0974a2083982668d2b43fbdc5 (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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins/platforms')
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 e8399bd3d2..89d55e9b48 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 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" |