diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-07-31 15:30:11 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-08-03 09:32:49 (GMT) |
| commit | fc34e1cbaeeaa54b15d28edfab16d5f302334f70 (patch) | |
| tree | f216d529a0425556b533e99111257aa7a8f2b160 /src/opengl | |
| parent | 232346cb33bd99016ba4210a95eeca45d24bf1b7 (diff) | |
| download | Qt-fc34e1cbaeeaa54b15d28edfab16d5f302334f70.zip Qt-fc34e1cbaeeaa54b15d28edfab16d5f302334f70.tar.gz Qt-fc34e1cbaeeaa54b15d28edfab16d5f302334f70.tar.bz2 | |
Fix build on X11/EGL without XRender
Reviewed-by: Trustme
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_x11egl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 5ab3647..ed9930f 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -299,6 +299,7 @@ void QGLWidget::setContext(QGLContext *context, const QGLContext* shareContext, int matchingCount = 0; chosenVisualInfo = XGetVisualInfo(x11Info().display(), VisualIDMask, &vi, &matchingCount); if (chosenVisualInfo) { +#if !defined(QT_NO_XRENDER) if (useArgbVisual) { // Check to make sure the visual provided by EGL is ARGB XRenderPictFormat *format; @@ -312,8 +313,9 @@ void QGLWidget::setContext(QGLContext *context, const QGLContext* shareContext, nativeVisualId, (int)qeglCtx->config()); vi.visualid = 0; } - } - else { + } else +#endif + { qDebug("Using opaque X Visual ID (%d) provided by EGL", (int)vi.visualid); vi = *chosenVisualInfo; } |