From 40b2d3f4c3b5310bfa4602a75be36e41ee9b3a06 Mon Sep 17 00:00:00 2001
From: Piotr Srebrny <piotr.srebrny@qt.io>
Date: Tue, 8 Feb 2022 12:17:13 +0100
Subject: 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>
---
 src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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);
-- 
cgit v1.2.3