aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAndrei Golubev <andrei.golubev@qt.io>2021-10-28 17:41:01 +0200
committerAndrei Golubev <andrei.golubev@qt.io>2021-10-29 17:49:13 +0200
commit3f2816ff6ed32b0ea93dae04d6e3db666922d77b (patch)
treed4461126d93f501e8f08dac1fe7e0c6e02551dcb /examples
parent171219a5ccd10d92127b246579e5a324614f1880 (diff)
rendercontrol_d3d11: Explicitly include qt_windows.h
Prevent accidental inclusion of windows.h through d3d11_1.h where max/min are defined as macro. That causes the subtle error elsewhere within the example Change-Id: I527c53ecbc82204a1f087719f5b0b4736d8c3447 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/rendercontrol/rendercontrol_d3d11/engine.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/engine.h b/examples/quick/rendercontrol/rendercontrol_d3d11/engine.h
index fdfee578ed..494fa40d28 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/engine.h
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/engine.h
@@ -52,6 +52,7 @@
#define ENGINE_H
#include <QWindow>
+#include <QtCore/qt_windows.h> // suppress windows.h include coming from d3d11_1.h
#include <d3d11_1.h>
#include <dxgi1_3.h>