Guard qwindowscombase.h with qt_windows.h include
qwindowscombase.h pulls in windows.h so not guarding its content by including qt_windows.h might cause hard to track down issues like min/max macros being defined. Pick-to: 6.5 6.2 5.15 Change-Id: I3c48660ed87122bb0c4f6830c8d0b288ec62a509 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io> Reviewed-by: Timothée Keller <timothee.keller@qt.io>
This commit is contained in:
parent
1d487e5593
commit
cbf29a8720
@ -4,6 +4,8 @@
|
||||
#ifndef QWINDOWSCOMBASE_H
|
||||
#define QWINDOWSCOMBASE_H
|
||||
|
||||
#include <qt_windows.h>
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#include <unknwn.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user