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>
This commit is contained in:
parent
66203133e3
commit
29a7489769
@ -37,6 +37,7 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtCore/qt_windows.h>
|
||||
#include "qwindowsdirect2dcontext.h"
|
||||
#include "qwindowsdirect2dhelpers.h"
|
||||
#include "qwindowsdirect2dintegration.h"
|
||||
|
@ -37,6 +37,7 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtCore/qt_windows.h>
|
||||
#include "qwindowsdirect2dcontext.h"
|
||||
#include "qwindowsdirect2dintegration.h"
|
||||
#include "qwindowsdirect2dbackingstore.h"
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user