diff options
| author | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-02-08 12:17:13 +0100 |
|---|---|---|
| committer | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-02-09 10:37:29 +0100 |
| commit | 40b2d3f4c3b5310bfa4602a75be36e41ee9b3a06 (patch) | |
| tree | 27d7f37f9a5a5bc1f1ab4f0fcbd966d21d7a8438 | |
| parent | 5b169fc1b3e0322701cc736d825c2ade90f96715 (diff) | |
| download | qtmultimedia-40b2d3f4c3b5310bfa4602a75be36e41ee9b3a06.tar.gz | |
Remove #include <qopengl.h> from the qt namespace
A part of the change Iaca58f6cf92eb25aac52b780dadd6f38fe998204 that
did not propagate to 6.2.
Fixes: QTBUG-100347
Change-Id: Ie48d93584192283f757ee4371a342bcbe1c99db5
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h b/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h index 0f031fa04..f68ae50f1 100644 --- a/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h +++ b/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h @@ -74,6 +74,10 @@ QT_END_NAMESPACE static const GUID MFSamplePresenter_SampleCounter = { 0xb0bb83cc, 0xf10f, 0x4e2e, { 0xaa, 0x2b, 0x29, 0xea, 0x5e, 0x92, 0xef, 0x85 } }; +#if QT_CONFIG(opengl) +# include <qopengl.h> +#endif + QT_BEGIN_NAMESPACE #ifdef MAYBE_ANGLE @@ -109,7 +113,7 @@ private: #endif // MAYBE_ANGLE #if QT_CONFIG(opengl) -#include <qopengl.h> + struct WglNvDxInterop { HANDLE (WINAPI* wglDXOpenDeviceNV) (void* dxDevice); BOOL (WINAPI* wglDXCloseDeviceNV) (HANDLE hDevice); |