From 5537ff4437ea7a5f9ea140071343f88bf48deddc Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Sat, 7 Nov 2020 02:22:36 +0100
Subject: Fix opengl headers inclusion issues

Chromium gl bindings headers get mixed with qt opengl headers.
This results in GLDEBUGPROC missing definition errors.

Fixes compilation for apalis-imx6 on zeus.

Task-number: QTBUG-88219
Change-Id: I0a18ceff3336ab457c2d9f35ef17c28c01bbe035
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/core/ozone/gl_ozone_egl_qt.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/core/ozone/gl_ozone_egl_qt.cpp')

diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp
index c33570d44..04b336990 100644
--- a/src/core/ozone/gl_ozone_egl_qt.cpp
+++ b/src/core/ozone/gl_ozone_egl_qt.cpp
@@ -40,14 +40,6 @@
 #if defined(USE_OZONE)
 #include <QtCore/qobject.h>
 #include <QtGui/qtgui-config.h>
-
-#if QT_CONFIG(opengl)
-#include <QOpenGLContext>
-QT_BEGIN_NAMESPACE
-Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
-QT_END_NAMESPACE
-#endif
-
 #include "gl_context_qt.h"
 #include "gl_ozone_egl_qt.h"
 #include "gl_surface_egl_qt.h"
@@ -90,10 +82,8 @@ bool GLOzoneEGLQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/)
 #if QT_CONFIG(opengl)
     if (!get_proc_address) {
         // QTBUG-63341 most likely libgles2 not linked with libegl -> fallback to qpa
-        if (QOpenGLContext *context = qt_gl_global_share_context()) {
-            get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(
-                context->getProcAddress("eglGetProcAddress"));
-        }
+        get_proc_address =
+                reinterpret_cast<gl::GLGetProcAddressProc>(GLContextHelper::getEglGetProcAddress());
     }
 #endif
 
-- 
cgit v1.2.3