diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-14 10:49:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-15 18:05:27 +0200 |
| commit | 57ae490b073ea14a9e7b3439031040515237eeb6 (patch) | |
| tree | a66d05c6c2c30643b77f204cb20b9e2ac4815804 /src/core/ozone/gl_ozone_egl_qt.cpp | |
| parent | 4d4330116471a495796e9d2723b3b5c508fc26b1 (diff) | |
| parent | bc6df3888128e3a0e0d4e2f8a69970ac36d8abe7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/core/ozone/gl_ozone_egl_qt.cpp')
| -rw-r--r-- | src/core/ozone/gl_ozone_egl_qt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp index 2fa86d79b..c692920cf 100644 --- a/src/core/ozone/gl_ozone_egl_qt.cpp +++ b/src/core/ozone/gl_ozone_egl_qt.cpp @@ -55,9 +55,9 @@ #include <EGL/egl.h> #include <dlfcn.h> -#include <QtGui/qtgui-config.h> // for QT_NO_OPENGL +#include <QtGui/qtgui-config.h> -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) #include <QOpenGLContext> QT_BEGIN_NAMESPACE Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context(); @@ -88,7 +88,7 @@ bool GLOzoneEGLQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/) reinterpret_cast<gl::GLGetProcAddressProc>( base::GetFunctionPointerFromNativeLibrary(eglgles2Library, "eglGetProcAddress")); -#ifndef QT_NO_OPENGL +#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()) { |