diff options
| author | Michał Zając <quintasan@kubuntu.org> | 2011-05-13 08:39:34 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-05-13 08:40:54 (GMT) |
| commit | dcbd920daf92d80302633f73dd8324437005a10e (patch) | |
| tree | bc9c8f01b0714e9756e61c2428a3ee62e000fdae | |
| parent | 1a742a039802b32cfe2a92d8ef1a04c3a21a964f (diff) | |
| download | Qt-dcbd920daf92d80302633f73dd8324437005a10e.zip Qt-dcbd920daf92d80302633f73dd8324437005a10e.tar.gz Qt-dcbd920daf92d80302633f73dd8324437005a10e.tar.bz2 | |
Retain ABI and API compatibility when Qt is built with EGL.
Author: Felix Geyer <debfx-pkg@fobos.de>
Merge-request: 1230
Reviewed-by: ossi
| -rw-r--r-- | src/opengl/qgl.h | 2 | ||||
| -rw-r--r-- | src/opengl/qgl_x11egl.cpp | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index c57995d..ab88d9c 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -401,7 +401,7 @@ protected: #if defined(Q_WS_WIN) virtual int choosePixelFormat(void* pfd, HDC pdc); #endif -#if defined(Q_WS_X11) && defined(QT_NO_EGL) +#if defined(Q_WS_X11) virtual void* tryVisual(const QGLFormat& f, int bufDepth = 1); virtual void* chooseVisual(); #endif diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 2ddfd35..34ca97d 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -257,6 +257,20 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) return true; } +void *QGLContext::chooseVisual() +{ + qFatal("QGLContext::chooseVisual - this method must not be called as Qt is built with EGL support"); + return 0; +} + +void *QGLContext::tryVisual(const QGLFormat& f, int bufDepth) +{ + Q_UNUSED(f); + Q_UNUSED(bufDepth); + qFatal("QGLContext::tryVisual - this method must not be called as Qt is built with EGL support"); + return 0; +} + void QGLWidget::resizeEvent(QResizeEvent *) { Q_D(QGLWidget); |