whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix no-EGL build 

Fixes: QTBUG-85464
Change-Id: If3a3acfb514c9b787bc3e9350da378d2f5d1bfa5
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
bb10
Tor Arne Vestbø 2020-07-07 11:43:36 +02:00
parent 357966a72c
commit 086ca457b5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/xcb/qxcbintegration.cpp
View File

@ -285,6 +285,7 @@ QOpenGLContext *QXcbIntegration::createOpenGLContext(GLXContext context, void *v
return nullptr;
}
#if QT_CONFIG(egl)
QOpenGLContext *QXcbIntegration::createOpenGLContext(EGLContext context, EGLDisplay display, QOpenGLContext *shareContext) const
{
using namespace QPlatformInterface::Private;
@ -293,6 +294,7 @@ QOpenGLContext *QXcbIntegration::createOpenGLContext(EGLContext context, EGLDisp
else
return nullptr;
}
#endif
#endif // QT_NO_OPENGL

4
src/plugins/platforms/xcb/qxcbintegration.h
View File

@ -58,7 +58,9 @@ class QXcbNativeInterface;
class Q_XCB_EXPORT QXcbIntegration : public QPlatformIntegration
#ifndef QT_NO_OPENGL
, public QPlatformInterface::Private::QGLXIntegration
# if QT_CONFIG(egl)
, public QPlatformInterface::Private::QEGLIntegration
# endif
#endif
{
public:
@ -71,7 +73,9 @@ public:
#ifndef QT_NO_OPENGL
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
QOpenGLContext *createOpenGLContext(GLXContext context, void *visualInfo, QOpenGLContext *shareContext) const override;
# if QT_CONFIG(egl)
QOpenGLContext *createOpenGLContext(EGLContext context, EGLDisplay display, QOpenGLContext *shareContext) const override;
# endif
#endif
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;