Integrate the OpenVG graphics system into Qt 4.6

This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/opengl/qglpixelbuffer_egl.cpp b/src/opengl/qglpixelbuffer_egl.cpp
index fca1a31..38e4f74 100644
--- a/src/opengl/qglpixelbuffer_egl.cpp
+++ b/src/opengl/qglpixelbuffer_egl.cpp
@@ -63,7 +63,7 @@ bool QGLPixelBufferPrivate::init(const QSize &size, const QGLFormat &f, QGLWidge
 {
     // Create the EGL context.
     ctx = new QEglContext();
-    ctx->setApi(QEglContext::OpenGL);
+    ctx->setApi(QEgl::OpenGL);
 
     // Open the EGL display.
     if (!ctx->openDisplay(0)) {
@@ -82,13 +82,13 @@ bool QGLPixelBufferPrivate::init(const QSize &size, const QGLFormat &f, QGLWidge
 #if QGL_RENDER_TEXTURE
     textureFormat = EGL_TEXTURE_RGBA;
     configProps.setValue(EGL_BIND_TO_TEXTURE_RGBA, EGL_TRUE);
-    ok = ctx->chooseConfig(configProps, QEglContext::BestPixelFormat);
+    ok = ctx->chooseConfig(configProps, QEgl::BestPixelFormat);
     if (!ok) {
         // Try again with RGB texture rendering.
         textureFormat = EGL_TEXTURE_RGB;
         configProps.removeValue(EGL_BIND_TO_TEXTURE_RGBA);
         configProps.setValue(EGL_BIND_TO_TEXTURE_RGB, EGL_TRUE);
-        ok = ctx->chooseConfig(configProps, QEglContext::BestPixelFormat);
+        ok = ctx->chooseConfig(configProps, QEgl::BestPixelFormat);
         if (!ok) {
             // One last try for a pbuffer with no texture rendering.
             configProps.removeValue(EGL_BIND_TO_TEXTURE_RGB);
@@ -99,7 +99,7 @@ bool QGLPixelBufferPrivate::init(const QSize &size, const QGLFormat &f, QGLWidge
     textureFormat = EGL_NONE;
 #endif
     if (!ok) {
-        if (!ctx->chooseConfig(configProps, QEglContext::BestPixelFormat)) {
+        if (!ctx->chooseConfig(configProps, QEgl::BestPixelFormat)) {
             delete ctx;
             ctx = 0;
             return false;
@@ -208,7 +208,7 @@ bool QGLPixelBuffer::hasOpenGLPbuffers()
         return false;
     QEglProperties configProps;
     qt_egl_set_format(configProps, QInternal::Pbuffer, QGLFormat::defaultFormat());
-    configProps.setRenderableType(QEglContext::OpenGL);
+    configProps.setRenderableType(QEgl::OpenGL);
     return ctx.chooseConfig(configProps);
 }