diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-16 12:36:03 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-16 12:36:03 (GMT) |
| commit | 82639818e567922e0255af039b9c397d13e4d9b7 (patch) | |
| tree | 6a6746acc321e21f546023a740b53b59297d64eb /src/opengl | |
| parent | 1eea52e5b18ef2167d375285e3838bd7883cfd7d (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | Qt-82639818e567922e0255af039b9c397d13e4d9b7.zip Qt-82639818e567922e0255af039b9c397d13e4d9b7.tar.gz Qt-82639818e567922e0255af039b9c397d13e4d9b7.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/opengl')
| -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 eb877c9..1f4eda3 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 a491bef..4dd7fc2 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); |