From 025952a9673264c3557f6f7c195eebc11892e80a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 20 Feb 2018 12:43:12 +0100 Subject: Fix embedded-linux -no-opengl build Change-Id: Iad7f3f21918fc8727a6fac3733cb6e35f4e1c4b0 Reviewed-by: Karim Pinter Reviewed-by: Michal Klocek --- src/core/surface_factory_qt.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/core/surface_factory_qt.cpp') diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp index 8c0bd6c82..f1eaf9667 100644 --- a/src/core/surface_factory_qt.cpp +++ b/src/core/surface_factory_qt.cpp @@ -56,10 +56,12 @@ #if defined(USE_OZONE) #include -#include #include +#ifndef QT_NO_OPENGL +#include Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context(); +#endif namespace QtWebEngineCore { @@ -105,6 +107,7 @@ bool GLOzoneQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/) reinterpret_cast( base::GetFunctionPointerFromNativeLibrary(eglgles2Library, "eglGetProcAddress")); +#ifndef QT_NO_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()) { @@ -112,6 +115,7 @@ bool GLOzoneQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/) context->getProcAddress("eglGetProcAddress")); } } +#endif if (!get_proc_address) { LOG(ERROR) << "eglGetProcAddress not found."; -- cgit v1.2.3