diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-07 11:43:36 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-07 21:07:58 +0200 |
| commit | 086ca457b524d826af5fc5e184bd8f649c431c21 (patch) | |
| tree | 349bdea6b7fc44a7906d928643cf46515cac2b52 | |
| parent | 357966a72cfc5f93d6f73ab43463a7958d4622c8 (diff) | |
Fix no-EGL build
Fixes: QTBUG-85464
Change-Id: If3a3acfb514c9b787bc3e9350da378d2f5d1bfa5
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index d93c7b3268..c7b8fb86db 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -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 diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h index 013555c6e0..043dc13711 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.h +++ b/src/plugins/platforms/xcb/qxcbintegration.h @@ -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; |