diff options
| author | Michał Zając <quintasan@kubuntu.org> | 2011-05-13 10:39:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-12 16:03:47 +0200 |
| commit | 93fde87898ac9680cd2c872ecf71b32adba50216 (patch) | |
| tree | 02e6eaa94fae8f98f48cf0af547478303b08d740 | |
| parent | 80cc17c78b7e812250f7498983ac14d909422325 (diff) | |
Retain ABI and API compatibility when Qt is built with EGL.
Author: Felix Geyer <debfx-pkg@fobos.de>
Merge-request: 1230
Reviewed-by: ossi
(cherry picked from commit dcbd920daf92d80302633f73dd8324437005a10e)
Change-Id: I8d2dc64a2785b4940d06c9493a3ba0f96a487f9b
Reviewed-on: http://codereview.qt-project.org/4569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -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 4d7b6f1978..f7685ed8b4 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -407,7 +407,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 a491bef4c6..4dd7fc2f5d 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); |