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.

11 files changed, 72 insertions, 1421 deletions

diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 73af174..c92b8cf 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -62,12 +62,9 @@ x11 {
     contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles1cl)|contains(QT_CONFIG, opengles2) {
         SOURCES +=  qgl_x11egl.cpp \
                     qglpixelbuffer_egl.cpp \
-                    qgl_egl.cpp \
-                    qegl.cpp \
-                    qegl_x11egl.cpp
+                    qgl_egl.cpp
 
-        HEADERS +=  qegl_p.h \
-                    qgl_egl_p.h
+        HEADERS +=  qgl_egl_p.h
 
     } else {
         SOURCES +=  qgl_x11.cpp \
@@ -93,13 +90,10 @@ win32:!wince*: {
 wince*: {
     SOURCES += qgl_wince.cpp \
                qglpixelbuffer_egl.cpp \
-               qgl_egl.cpp \
-               qegl.cpp \
-               qegl_wince.cpp
+               qgl_egl.cpp
 
     HEADERS += qgl_cl_p.h \
                qgl_egl_p.h \
-               qegl_p.h
 }
 
 embedded {
@@ -108,15 +102,12 @@ embedded {
                qglpixelbuffer_egl.cpp \
                qglscreen_qws.cpp \
                qglwindowsurface_qws.cpp \
-               qegl.cpp \
-               qegl_qws.cpp \
                qgl_egl.cpp
 
     HEADERS += qglpaintdevice_qws_p.h \
                qglscreen_qws.h \
                qglwindowsurface_qws_p.h \
-               qgl_egl_p.h \
-               qegl_p.h
+               qgl_egl_p.h
 
     contains(QT_CONFIG, fontconfig) {
         include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
diff --git a/src/opengl/qegl.cpp b/src/opengl/qegl.cpp
deleted file mode 100644
index 61c7427..0000000
--- a/src/opengl/qegl.cpp
+++ /dev/null
@@ -1,842 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui/qpaintdevice.h>
-#include <QtGui/qpixmap.h>
-#include <QtGui/qwidget.h>
-#include <QtCore/qdebug.h>
-#include "qegl_p.h"
-
-#if defined(QT_OPENGL_ES) || defined(QT_OPENVG)
-
-QT_BEGIN_NAMESPACE
-
-QEglContext::QEglContext()
-{
-    apiType = OpenGL;
-    dpy = EGL_NO_DISPLAY;
-    ctx = EGL_NO_CONTEXT;
-    surf = EGL_NO_SURFACE;
-    cfg = 0;
-    share = false;
-    reserved = 0;
-}
-
-QEglContext::~QEglContext()
-{
-    destroy();
-}
-
-bool QEglContext::isValid() const
-{
-    return (ctx != EGL_NO_CONTEXT);
-}
-
-bool QEglContext::isSharing() const
-{
-    return share;
-}
-
-// Open the EGL display associated with "device".
-bool QEglContext::openDisplay(QPaintDevice *device)
-{
-    if (dpy == EGL_NO_DISPLAY)
-        dpy = defaultDisplay(device);
-    return (dpy != EGL_NO_DISPLAY);
-}
-
-// Choose a configuration that matches "properties".
-bool QEglContext::chooseConfig
-        (const QEglProperties& properties, PixelFormatMatch match)
-{
-    QEglProperties props(properties);
-    EGLConfig *configs;
-    EGLint matching, size;
-    do {
-        // Get the number of matching configurations for this set of properties.
-        matching = 0;
-        if (!eglChooseConfig(dpy, props.properties(), 0, 256, &matching) || !matching)
-            continue;
-
-        // If we want the best pixel format, then return the first
-        // matching configuration.
-        if (match == BestPixelFormat) {
-            eglChooseConfig(dpy, props.properties(), &cfg, 1, &matching);
-            if (matching < 1)
-                continue;
-            return true;
-        }
-
-        // Fetch all of the matching configurations and find the
-        // first that matches the pixel format we wanted.
-        size = matching;
-        configs = new EGLConfig [size];
-        eglChooseConfig(dpy, props.properties(), configs, size, &matching);
-        for (EGLint index = 0; index < size; ++index) {
-            EGLint red, green, blue, alpha;
-            eglGetConfigAttrib(dpy, configs[index], EGL_RED_SIZE, &red);
-            eglGetConfigAttrib(dpy, configs[index], EGL_GREEN_SIZE, &green);
-            eglGetConfigAttrib(dpy, configs[index], EGL_BLUE_SIZE, &blue);
-            eglGetConfigAttrib(dpy, configs[index], EGL_ALPHA_SIZE, &alpha);
-            if (red == props.value(EGL_RED_SIZE) &&
-                    green == props.value(EGL_GREEN_SIZE) &&
-                    blue == props.value(EGL_BLUE_SIZE) &&
-                    (props.value(EGL_ALPHA_SIZE) == 0 ||
-                     alpha == props.value(EGL_ALPHA_SIZE))) {
-                cfg = configs[index];
-                delete [] configs;
-                return true;
-            }
-        }
-        delete [] configs;
-    } while (props.reduceConfiguration());
-
-#ifdef EGL_BIND_TO_TEXTURE_RGBA
-    // Don't report an error just yet if we failed to get a pbuffer
-    // configuration with texture rendering.  Only report failure if
-    // we cannot get any pbuffer configurations at all.
-    if (props.value(EGL_BIND_TO_TEXTURE_RGBA) == EGL_DONT_CARE &&
-        props.value(EGL_BIND_TO_TEXTURE_RGB) == EGL_DONT_CARE)
-#endif
-    {
-        qWarning() << "QEglContext::chooseConfig(): Could not find a suitable EGL configuration";
-        qWarning() << "Requested:" << props.toString();
-        qWarning() << "Available:";
-        dumpAllConfigs();
-    }
-    return false;
-}
-
-// Create the EGLContext.
-bool QEglContext::createContext(QEglContext *shareContext)
-{
-    // We need to select the correct API before calling eglCreateContext().
-#ifdef EGL_OPENGL_ES_API
-    if (apiType == OpenGL)
-        eglBindAPI(EGL_OPENGL_ES_API);
-#endif
-#ifdef EGL_OPENVG_API
-    if (apiType == OpenVG)
-        eglBindAPI(EGL_OPENVG_API);
-#endif
-
-    // Create a new context for the configuration.
-    QEglProperties contextProps;
-#if defined(QT_OPENGL_ES_2)
-    if (apiType == OpenGL)
-        contextProps.setValue(EGL_CONTEXT_CLIENT_VERSION, 2);
-#endif
-    if (shareContext && shareContext->ctx == EGL_NO_CONTEXT)
-        shareContext = 0;
-    if (shareContext) {
-        ctx = eglCreateContext(dpy, cfg, shareContext->ctx, contextProps.properties());
-        if (ctx == EGL_NO_CONTEXT) {
-            qWarning() << "QEglContext::createContext(): Could not share context:" << errorString(eglGetError());
-            shareContext = 0;
-        }
-    }
-    if (ctx == EGL_NO_CONTEXT) {
-        ctx = eglCreateContext(dpy, cfg, 0, contextProps.properties());
-        if (ctx == EGL_NO_CONTEXT) {
-            qWarning() << "QEglContext::createContext(): Unable to create EGL context:" << errorString(eglGetError());
-            return false;
-        }
-    }
-    share = (shareContext != 0);
-    return true;
-}
-
-// Recreate the surface for a paint device because the native id has changed.
-bool QEglContext::recreateSurface(QPaintDevice *device)
-{
-    // Bail out if the surface has not been created for the first time yet.
-    if (surf == EGL_NO_SURFACE)
-        return true;
-
-    // Destroy the old surface.
-    eglDestroySurface(dpy, surf);
-
-    // Create a new one.
-    return createSurface(device);
-}
-
-void QEglContext::destroy()
-{
-    if (ctx != EGL_NO_CONTEXT)
-        eglDestroyContext(dpy, ctx);
-    dpy = EGL_NO_DISPLAY;
-    ctx = EGL_NO_CONTEXT;
-    surf = EGL_NO_SURFACE;
-    cfg = 0;
-    share = false;
-}
-
-bool QEglContext::makeCurrent()
-{
-    if(ctx == EGL_NO_CONTEXT) {
-        qWarning() << "QEglContext::makeCurrent(): Cannot make invalid context current";
-        return false;
-    }
-
-    bool ok = eglMakeCurrent(dpy, surf, surf, ctx);
-    if (!ok) {
-        EGLint err = eglGetError();
-        qWarning() << "QEglContext::makeCurrent():" << errorString(err);
-    }
-    return ok;
-}
-
-bool QEglContext::doneCurrent()
-{
-    // If the context is invalid, we assume that an error was reported
-    // when makeCurrent() was called.
-    if (ctx == EGL_NO_CONTEXT)
-        return false;
-
-    // We need to select the correct API before calling eglMakeCurrent()
-    // with EGL_NO_CONTEXT because threads can have both OpenGL and OpenVG
-    // contexts active at the same time.
-#ifdef EGL_OPENGL_ES_API
-    if (apiType == OpenGL)
-        eglBindAPI(EGL_OPENGL_ES_API);
-#endif
-#ifdef EGL_OPENVG_API
-    if (apiType == OpenVG)
-        eglBindAPI(EGL_OPENVG_API);
-#endif
-
-    bool ok = eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    if (!ok) {
-        EGLint err = eglGetError();
-        qWarning() << "QEglContext::doneCurrent():" << errorString(err);
-    }
-    return ok;
-}
-
-bool QEglContext::swapBuffers()
-{
-    if(ctx == EGL_NO_CONTEXT)
-        return false;
-
-    bool ok = eglSwapBuffers(dpy, surf);
-    if (!ok) {
-        EGLint err = eglGetError();
-        qWarning() << "QEglContext::swapBuffers():" << errorString(err);
-    }
-    return ok;
-}
-
-// Wait for native rendering operations to complete before starting
-// to use OpenGL/OpenVG operations.
-void QEglContext::waitNative()
-{
-#ifdef EGL_CORE_NATIVE_ENGINE
-    eglWaitNative(EGL_CORE_NATIVE_ENGINE);
-#endif
-}
-
-// Wait for client OpenGL/OpenVG operations to complete before
-// using native rendering operations.
-void QEglContext::waitClient()
-{
-#ifdef EGL_OPENGL_ES_API
-    if (apiType == OpenGL) {
-        eglBindAPI(EGL_OPENGL_ES_API);
-        eglWaitClient();
-    }
-#else
-    if (apiType == OpenGL)
-        eglWaitGL();
-#endif
-#ifdef EGL_OPENVG_API
-    if (apiType == OpenVG) {
-        eglBindAPI(EGL_OPENVG_API);
-        eglWaitClient();
-    }
-#endif
-}
-
-// Query the actual size of the EGL surface.
-QSize QEglContext::surfaceSize() const
-{
-    int w, h;
-    eglQuerySurface(dpy, surf, EGL_WIDTH, &w);
-    eglQuerySurface(dpy, surf, EGL_HEIGHT, &h);
-    return QSize(w, h);
-}
-
-// Query the value of a configuration attribute.
-bool QEglContext::configAttrib(int name, EGLint *value) const
-{
-    return eglGetConfigAttrib(dpy, cfg, name, value);
-}
-
-// Retrieve all of the properties on "cfg".  If zero, return
-// the context's configuration.
-QEglProperties QEglContext::configProperties(EGLConfig cfg) const
-{
-    if (!cfg)
-        cfg = config();
-    QEglProperties props;
-    for (int name = 0x3020; name <= 0x304F; ++name) {
-        EGLint value;
-        if (name != EGL_NONE && eglGetConfigAttrib(dpy, cfg, name, &value))
-            props.setValue(name, value);
-    }
-    eglGetError();  // Clear the error state.
-    return props;
-}
-
-// Initialize and return the default display.
-EGLDisplay QEglContext::defaultDisplay(QPaintDevice *device)
-{
-    static EGLDisplay dpy = EGL_NO_DISPLAY;
-    if (dpy == EGL_NO_DISPLAY) {
-        dpy = getDisplay(device);
-        if (dpy == EGL_NO_DISPLAY) {
-            qWarning() << "QEglContext::defaultDisplay(): Cannot open EGL display";
-            return EGL_NO_DISPLAY;
-        }
-        if (!eglInitialize(dpy, NULL, NULL)) {
-            EGLint err = eglGetError();
-            qWarning() << "QEglContext::defaultDisplay(): Cannot initialize EGL display:" << errorString(err);
-            return EGL_NO_DISPLAY;
-        }
-#ifdef EGL_OPENGL_ES_API
-        eglBindAPI(EGL_OPENGL_ES_API);
-#endif
-    }
-    return dpy;
-}
-
-// Return the error string associated with a specific code.
-QString QEglContext::errorString(int code)
-{
-    static const char * const errors[] = {
-        "Success (0x3000)",                 // No tr
-        "Not initialized (0x3001)",         // No tr
-        "Bad access (0x3002)",              // No tr
-        "Bad alloc (0x3003)",               // No tr
-        "Bad attribute (0x3004)",           // No tr
-        "Bad config (0x3005)",              // No tr
-        "Bad context (0x3006)",             // No tr
-        "Bad current surface (0x3007)",     // No tr
-        "Bad display (0x3008)",             // No tr
-        "Bad match (0x3009)",               // No tr
-        "Bad native pixmap (0x300A)",       // No tr
-        "Bad native window (0x300B)",       // No tr
-        "Bad parameter (0x300C)",           // No tr
-        "Bad surface (0x300D)",             // No tr
-        "Context lost (0x300E)"             // No tr
-    };
-    if (code >= 0x3000 && code <= 0x300E) {
-        return QString::fromLatin1(errors[code - 0x3000]);
-    } else {
-        return QLatin1String("0x") + QString::number(code, 16);
-    }
-}
-
-// Dump all of the EGL configurations supported by the system.
-void QEglContext::dumpAllConfigs()
-{
-    QEglProperties props;
-    EGLint count = 0;
-    if (!eglGetConfigs(dpy, 0, 0, &count))
-        return;
-    if (count < 1)
-        return;
-    EGLConfig *configs = new EGLConfig [count];
-    eglGetConfigs(dpy, configs, count, &count);
-    for (EGLint index = 0; index < count; ++index) {
-        props = configProperties(configs[index]);
-        qWarning() << props.toString();
-    }
-    delete [] configs;
-}
-
-// Initialize a property block.
-QEglProperties::QEglProperties()
-{
-    props.append(EGL_NONE);
-}
-
-// Fetch the current value associated with a property.
-int QEglProperties::value(int name) const
-{
-    for (int index = 0; index < (props.size() - 1); index += 2) {
-        if (props[index] == name)
-            return props[index + 1];
-    }
-
-    // If the attribute has not been explicitly set, return the EGL default
-    // The following defaults were taken from the EGL 1.4 spec:
-    switch(name) {
-    case EGL_BUFFER_SIZE: return 0;
-    case EGL_RED_SIZE: return 0;
-    case EGL_GREEN_SIZE: return 0;
-    case EGL_BLUE_SIZE: return 0;
-    case EGL_ALPHA_SIZE: return 0;
-#if defined(EGL_LUMINANCE_SIZE)
-    case EGL_LUMINANCE_SIZE: return 0;
-#endif
-#if defined(EGL_ALPHA_MASK_SIZE)
-    case EGL_ALPHA_MASK_SIZE: return 0;
-#endif
-    case EGL_BIND_TO_TEXTURE_RGB: return EGL_DONT_CARE;
-    case EGL_BIND_TO_TEXTURE_RGBA: return EGL_DONT_CARE;
-#if defined(EGL_COLOR_BUFFER_TYPE)
-    case EGL_COLOR_BUFFER_TYPE: return EGL_RGB_BUFFER;
-#endif
-    case EGL_CONFIG_CAVEAT: return EGL_DONT_CARE;
-    case EGL_CONFIG_ID: return EGL_DONT_CARE;
-    case EGL_DEPTH_SIZE: return 0;
-    case EGL_LEVEL: return 0;
-    case EGL_NATIVE_RENDERABLE: return EGL_DONT_CARE;
-    case EGL_NATIVE_VISUAL_TYPE: return EGL_DONT_CARE;
-    case EGL_MAX_SWAP_INTERVAL: return EGL_DONT_CARE;
-    case EGL_MIN_SWAP_INTERVAL: return EGL_DONT_CARE;
-#if defined(EGL_RENDERABLE_TYPE)
-    case EGL_RENDERABLE_TYPE: return EGL_OPENGL_ES_BIT;
-#endif
-    case EGL_SAMPLE_BUFFERS: return 0;
-    case EGL_SAMPLES: return 0;
-    case EGL_STENCIL_SIZE: return 0;
-    case EGL_SURFACE_TYPE: return EGL_WINDOW_BIT;
-    case EGL_TRANSPARENT_TYPE: return EGL_NONE;
-    case EGL_TRANSPARENT_RED_VALUE: return EGL_DONT_CARE;
-    case EGL_TRANSPARENT_GREEN_VALUE: return EGL_DONT_CARE;
-    case EGL_TRANSPARENT_BLUE_VALUE: return EGL_DONT_CARE;
-
-#if defined(EGL_VERSION_1_3)
-    case EGL_CONFORMANT: return 0;
-    case EGL_MATCH_NATIVE_PIXMAP: return EGL_NONE;
-#endif
-
-    case EGL_MAX_PBUFFER_HEIGHT:
-    case EGL_MAX_PBUFFER_WIDTH:
-    case EGL_MAX_PBUFFER_PIXELS:
-    case EGL_NATIVE_VISUAL_ID:
-    case EGL_NONE:
-        qWarning("QEglProperties::value() - Attibute %d does not affect config selection", name);
-        return EGL_DONT_CARE;
-    default:
-        qWarning("QEglProperties::value() - Attibute %d is unknown in EGL <=1.4", name);
-        return EGL_DONT_CARE;
-    }
-}
-
-// Set the value associated with a property, replacing an existing
-// value if there is one.
-void QEglProperties::setValue(int name, int value)
-{
-    for (int index = 0; index < (props.size() - 1); index += 2) {
-        if (props[index] == name) {
-            props[index + 1] = value;
-            return;
-        }
-    }
-    props[props.size() - 1] = name;
-    props.append(value);
-    props.append(EGL_NONE);
-}
-
-// Remove a property value.  Returns false if the property is not present.
-bool QEglProperties::removeValue(int name)
-{
-    for (int index = 0; index < (props.size() - 1); index += 2) {
-        if (props[index] == name) {
-            while ((index + 2) < props.size()) {
-                props[index] = props[index + 2];
-                ++index;
-            }
-            props.resize(props.size() - 2);
-            return true;
-        }
-    }
-    return false;
-}
-
-// Sets the red, green, blue, and alpha sizes based on a pixel format.
-// Normally used to match a configuration request to the screen format.
-void QEglProperties::setPixelFormat(QImage::Format pixelFormat)
-{
-    int red, green, blue, alpha;
-    switch (pixelFormat) {
-        case QImage::Format_RGB32:
-        case QImage::Format_RGB888:
-            red = green = blue = 8; alpha = 0; break;
-        case QImage::Format_ARGB32:
-        case QImage::Format_ARGB32_Premultiplied:
-            red = green = blue = alpha = 8; break;
-        case QImage::Format_RGB16:
-            red = 5; green = 6; blue = 5; alpha = 0; break;
-        case QImage::Format_ARGB8565_Premultiplied:
-            red = 5; green = 6; blue = 5; alpha = 8; break;
-        case QImage::Format_RGB666:
-            red = green = blue = 6; alpha = 0; break;
-        case QImage::Format_ARGB6666_Premultiplied:
-            red = green = blue = alpha = 6; break;
-        case QImage::Format_RGB555:
-            red = green = blue = 5; alpha = 0; break;
-        case QImage::Format_ARGB8555_Premultiplied:
-            red = green = blue = 5; alpha = 8; break;
-        case QImage::Format_RGB444:
-            red = green = blue = 4; alpha = 0; break;
-        case QImage::Format_ARGB4444_Premultiplied:
-            red = green = blue = alpha = 4; break;
-        default:
-            qWarning() << "QEglProperties::setPixelFormat(): Unsupported pixel format";
-            red = green = blue = alpha = 1; break;
-    }
-    setValue(EGL_RED_SIZE, red);
-    setValue(EGL_GREEN_SIZE, green);
-    setValue(EGL_BLUE_SIZE, blue);
-    setValue(EGL_ALPHA_SIZE, alpha);
-}
-
-void QEglProperties::setRenderableType(int api)
-{
-#if defined(EGL_RENDERABLE_TYPE)
-#if defined(QT_OPENGL_ES_2)
-    if (api == QEglContext::OpenGL)
-        setValue(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT);
-#elif defined(QT_OPENGL_ES)
-    if (api == QEglContext::OpenGL)
-        setValue(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT);
-#endif
-#if defined(EGL_OPENVG_BIT)
-    if (api == QEglContext::OpenVG)
-        setValue(EGL_RENDERABLE_TYPE, EGL_OPENVG_BIT);
-#endif
-#else
-    Q_UNUSED(api);
-#endif
-}
-
-// Reduce the complexity of a configuration request to ask for less
-// because the previous request did not result in success.  Returns
-// true if the complexity was reduced, or false if no further
-// reductions in complexity are possible.
-bool QEglProperties::reduceConfiguration()
-{
-    if (removeValue(EGL_SAMPLE_BUFFERS)) {
-        removeValue(EGL_SAMPLES);
-        return true;
-    }
-    if (removeValue(EGL_ALPHA_SIZE))
-        return true;
-    if (removeValue(EGL_STENCIL_SIZE))
-        return true;
-    if (removeValue(EGL_DEPTH_SIZE))
-        return true;
-    return false;
-}
-
-static void addTag(QString& str, const QString& tag)
-{
-    int lastnl = str.lastIndexOf(QLatin1String("\n"));
-    if (lastnl == -1)
-        lastnl = 0;
-    if ((str.length() - lastnl) >= 50)
-        str += QLatin1String("\n   ");
-    str += tag;
-}
-
-// Convert a property list to a string suitable for debug output.
-QString QEglProperties::toString() const
-{
-    QString str;
-    int val;
-
-    val = value(EGL_CONFIG_ID);
-    if (val != EGL_DONT_CARE) {
-        str += QLatin1String("id=");
-        str += QString::number(val);
-        str += QLatin1Char(' ');
-    }
-
-#ifdef EGL_RENDERABLE_TYPE
-    val = value(EGL_RENDERABLE_TYPE);
-    if (val != EGL_DONT_CARE) {
-        str += QLatin1String("type=");
-        QStringList types;
-        if ((val & EGL_OPENGL_ES_BIT) != 0)
-            types += QLatin1String("es1");
-#ifdef EGL_OPENGL_ES2_BIT
-        if ((val & EGL_OPENGL_ES2_BIT) != 0)
-            types += QLatin1String("es2");
-#endif
-        if ((val & EGL_OPENVG_BIT) != 0)
-            types += QLatin1String("vg");
-        if ((val & ~7) != 0)
-            types += QString::number(val);
-        str += types.join(QLatin1String(","));
-    } else {
-        str += QLatin1String("type=any");
-    }
-#else
-    str += QLatin1String("type=es1");
-#endif
-
-    int red = value(EGL_RED_SIZE);
-    int green = value(EGL_GREEN_SIZE);
-    int blue = value(EGL_BLUE_SIZE);
-    int alpha = value(EGL_ALPHA_SIZE);
-    int bufferSize = value(EGL_BUFFER_SIZE);
-    if (bufferSize == (red + green + blue + alpha))
-        bufferSize = EGL_DONT_CARE;
-    str += QLatin1String(" rgba=");
-    str += QString::number(red);
-    str += QLatin1Char(',');
-    str += QString::number(green);
-    str += QLatin1Char(',');
-    str += QString::number(blue);
-    str += QLatin1Char(',');
-    str += QString::number(alpha);
-    if (bufferSize != EGL_DONT_CARE) {
-        // Only report buffer size if different than r+g+b+a.
-        str += QLatin1String(" buffer-size=");
-        str += QString::number(bufferSize);
-    }
-
-#ifdef EGL_COLOR_BUFFER_TYPE
-    val = value(EGL_COLOR_BUFFER_TYPE);
-    if (val == EGL_LUMINANCE_BUFFER) {
-        addTag(str, QLatin1String(" color-buffer-type=luminance"));
-    } else if (val != EGL_DONT_CARE && val != EGL_RGB_BUFFER) {
-        addTag(str, QLatin1String(" color-buffer-type="));
-        str += QString::number(val, 16);
-    }
-#endif
-
-    val = value(EGL_DEPTH_SIZE);
-    if (val != 0) {
-        addTag(str, QLatin1String(" depth="));
-        str += QString::number(val);
-    }
-
-    val = value(EGL_STENCIL_SIZE);
-    if (val != 0) {
-        addTag(str, QLatin1String(" stencil="));
-        str += QString::number(val);
-    }
-
-    val = value(EGL_SURFACE_TYPE);
-    if (val != EGL_DONT_CARE) {
-        addTag(str, QLatin1String(" surface-type="));
-        QStringList types;
-        if ((val & EGL_WINDOW_BIT) != 0)
-            types += QLatin1String("window");
-        if ((val & EGL_PIXMAP_BIT) != 0)
-            types += QLatin1String("pixmap");
-        if ((val & EGL_PBUFFER_BIT) != 0)
-            types += QLatin1String("pbuffer");
-#ifdef EGL_VG_COLORSPACE_LINEAR_BIT
-        if ((val & EGL_VG_COLORSPACE_LINEAR_BIT) != 0)
-            types += QLatin1String("vg-colorspace-linear");
-#endif
-#ifdef EGL_VG_ALPHA_FORMAT_PRE_BIT
-        if ((val & EGL_VG_ALPHA_FORMAT_PRE_BIT) != 0)
-            types += QLatin1String("vg-alpha-format-pre");
-#endif
-        if ((val & ~(EGL_WINDOW_BIT | EGL_PIXMAP_BIT | EGL_PBUFFER_BIT
-#ifdef EGL_VG_COLORSPACE_LINEAR_BIT
-                     | EGL_VG_COLORSPACE_LINEAR_BIT
-#endif
-#ifdef EGL_VG_ALPHA_FORMAT_PRE_BIT
-                     | EGL_VG_ALPHA_FORMAT_PRE_BIT
-#endif
-                     )) != 0) {
-            types += QString::number(val);
-        }
-        str += types.join(QLatin1String(","));
-    }
-
-    val = value(EGL_CONFIG_CAVEAT);
-    if (val != EGL_DONT_CARE) {
-        addTag(str, QLatin1String(" caveat="));
-        if (val == EGL_NONE)
-            str += QLatin1String("none");
-        else if (val == EGL_SLOW_CONFIG)
-            str += QLatin1String("slow");
-        else if (val == EGL_NON_CONFORMANT_CONFIG)
-            str += QLatin1String("non-conformant");
-        else
-            str += QString::number(val, 16);
-    }
-
-    val = value(EGL_LEVEL);
-    if (val != 0) {
-        addTag(str, QLatin1String(" level="));
-        str += QString::number(val);
-    }
-
-    int width, height, pixels;
-    width = value(EGL_MAX_PBUFFER_WIDTH);
-    height = value(EGL_MAX_PBUFFER_HEIGHT);
-    pixels = value(EGL_MAX_PBUFFER_PIXELS);
-    if (height != EGL_DONT_CARE || width != EGL_DONT_CARE) {
-        addTag(str, QLatin1String(" max-pbuffer-size="));
-        str += QString::number(width);
-        str += QLatin1Char('x');
-        str += QString::number(height);
-        if (pixels != (width * height)) {
-            addTag(str, QLatin1String(" max-pbuffer-pixels="));
-            str += QString::number(pixels);
-        }
-    }
-
-    val = value(EGL_NATIVE_RENDERABLE);
-    if (val != EGL_DONT_CARE) {
-        if (val)
-            addTag(str, QLatin1String(" native-renderable=true"));
-        else
-            addTag(str, QLatin1String(" native-renderable=false"));
-    }
-
-    val = value(EGL_NATIVE_VISUAL_ID);
-    if (val != EGL_DONT_CARE) {
-        addTag(str, QLatin1String(" visual-id="));
-        str += QString::number(val);
-    }
-
-    val = value(EGL_NATIVE_VISUAL_TYPE);
-    if (val != EGL_DONT_CARE) {
-        addTag(str, QLatin1String(" visual-type="));
-        str += QString::number(val);
-    }
-
-#ifdef EGL_PRESERVED_RESOURCES
-    val = value(EGL_PRESERVED_RESOURCES);
-    if (val != EGL_DONT_CARE) {
-        if (val)
-            addTag(str, QLatin1String(" preserved-resources=true"));
-        else
-            addTag(str, QLatin1String(" preserved-resources=false"));
-    }
-#endif
-
-    val = value(EGL_SAMPLES);
-    if (val != 0) {
-        addTag(str, QLatin1String(" samples="));
-        str += QString::number(val);
-    }
-
-    val = value(EGL_SAMPLE_BUFFERS);
-    if (val != 0) {
-        addTag(str, QLatin1String(" sample-buffers="));
-        str += QString::number(val);
-    }
-
-    val = value(EGL_TRANSPARENT_TYPE);
-    if (val == EGL_TRANSPARENT_RGB) {
-        addTag(str, QLatin1String(" transparent-rgb="));
-        str += QString::number(value(EGL_TRANSPARENT_RED_VALUE));
-        str += QLatin1Char(',');
-        str += QString::number(value(EGL_TRANSPARENT_GREEN_VALUE));
-        str += QLatin1Char(',');
-        str += QString::number(value(EGL_TRANSPARENT_BLUE_VALUE));
-    }
-
-#if defined(EGL_BIND_TO_TEXTURE_RGB) && defined(EGL_BIND_TO_TEXTURE_RGBA)
-    val = value(EGL_BIND_TO_TEXTURE_RGB);
-    int val2 = value(EGL_BIND_TO_TEXTURE_RGBA);
-    if (val != EGL_DONT_CARE || val2 != EGL_DONT_CARE) {
-        addTag(str, QLatin1String(" bind-texture="));
-        if (val == EGL_TRUE)
-            str += QLatin1String("rgb");
-        else
-            str += QLatin1String("no-rgb");
-        if (val2 == EGL_TRUE)
-            str += QLatin1String(",rgba");
-        else
-            str += QLatin1String(",no-rgba");
-    }
-#endif
-
-#ifdef EGL_MIN_SWAP_INTERVAL
-    val = value(EGL_MIN_SWAP_INTERVAL);
-    if (val != EGL_DONT_CARE) {
-        addTag(str, QLatin1String(" min-swap-interval="));
-        str += QString::number(val);
-    }
-#endif
-
-#ifdef EGL_MIN_SWAP_INTERVAL
-    val = value(EGL_MAX_SWAP_INTERVAL);
-    if (val != EGL_DONT_CARE) {
-        addTag(str, QLatin1String(" max-swap-interval="));
-        str += QString::number(val);
-    }
-#endif
-
-#ifdef EGL_LUMINANCE_SIZE
-    val = value(EGL_LUMINANCE_SIZE);
-    if (val != 0) {
-        addTag(str, QLatin1String(" luminance="));
-        str += QString::number(val);
-    }
-#endif
-
-#ifdef EGL_ALPHA_MASK_SIZE
-    val = value(EGL_ALPHA_MASK_SIZE);
-    if (val != 0) {
-        addTag(str, QLatin1String(" alpha-mask="));
-        str += QString::number(val);
-    }
-#endif
-
-#ifdef EGL_CONFORMANT
-    val = value(EGL_CONFORMANT);
-    if (val != 0) {
-        if (val)
-            addTag(str, QLatin1String(" conformant=true"));
-        else
-            addTag(str, QLatin1String(" conformant=false"));
-    }
-#endif
-
-    return str;
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_OPENGL_ES || QT_OPENVG
diff --git a/src/opengl/qegl_p.h b/src/opengl/qegl_p.h
deleted file mode 100644
index 4e46965..0000000
--- a/src/opengl/qegl_p.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QEGL_P_H
-#define QEGL_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of the QGLWidget class.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "QtCore/qvarlengtharray.h"
-#include "QtCore/qsize.h"
-#include "QtGui/qimage.h"
-
-#if defined(QT_OPENGL_ES) || defined(QT_OPENVG)
-
-QT_BEGIN_INCLUDE_NAMESPACE
-#if defined(QT_OPENGL_ES_2) || defined(QT_OPENVG)
-#include <EGL/egl.h>
-#else
-#include <GLES/egl.h>
-#endif
-#if !defined(EGL_VERSION_1_3) && !defined(QEGL_NATIVE_TYPES_DEFINED)
-#undef EGLNativeWindowType
-#undef EGLNativePixmapType
-#undef EGLNativeDisplayType
-typedef NativeWindowType EGLNativeWindowType;
-typedef NativePixmapType EGLNativePixmapType;
-typedef NativeDisplayType EGLNativeDisplayType;
-#define QEGL_NATIVE_TYPES_DEFINED 1
-#endif
-QT_END_INCLUDE_NAMESPACE
-
-class QX11Info;
-class QPaintDevice;
-class QImage;
-class QPixmap;
-class QWidget;
-
-QT_BEGIN_NAMESPACE
-
-class Q_OPENGL_EXPORT QEglProperties
-{
-public:
-    QEglProperties();
-    QEglProperties(const QEglProperties& other) : props(other.props) {}
-    ~QEglProperties() {}
-
-    int value(int name) const;
-    void setValue(int name, int value);
-    bool removeValue(int name);
-
-    const int *properties() const { return props.constData(); }
-
-    void setPixelFormat(QImage::Format pixelFormat);
-#ifdef Q_WS_X11
-    void setVisualFormat(const QX11Info *xinfo);
-#endif
-    void setRenderableType(int api);
-
-    bool reduceConfiguration();
-
-    QString toString() const;
-
-private:
-    QVarLengthArray<int> props;
-};
-
-class Q_OPENGL_EXPORT QEglContext
-{
-public:
-    QEglContext();
-    ~QEglContext();
-
-    enum API
-    {
-        OpenGL,
-        OpenVG
-    };
-
-    enum PixelFormatMatch
-    {
-        ExactPixelFormat,
-        BestPixelFormat
-    };
-
-    bool isValid() const;
-    bool isSharing() const;
-
-    void setApi(QEglContext::API api) { apiType = api; }
-    bool openDisplay(QPaintDevice *device);
-    bool chooseConfig(const QEglProperties& properties, PixelFormatMatch match = ExactPixelFormat);
-    bool createContext(QEglContext *shareContext = 0);
-    bool createSurface(QPaintDevice *device);
-    bool recreateSurface(QPaintDevice *device);
-    void setSurface(EGLSurface surface) { surf = surface; }
-
-    void destroy();
-
-    bool makeCurrent();
-    bool doneCurrent();
-    bool swapBuffers();
-
-    void waitNative();
-    void waitClient();
-
-    QSize surfaceSize() const;
-
-    bool configAttrib(int name, EGLint *value) const;
-
-    void clearError() const { eglGetError(); }
-
-    QEglContext::API api() const { return apiType; }
-
-    EGLDisplay display() const { return dpy; }
-    EGLContext context() const { return ctx; }
-    EGLSurface surface() const { return surf; }
-    EGLConfig config() const { return cfg; }
-
-    QEglProperties configProperties(EGLConfig cfg = 0) const;
-
-    static EGLDisplay defaultDisplay(QPaintDevice *device);
-    static QString errorString(int code);
-
-    void dumpAllConfigs();
-
-private:
-    QEglContext::API apiType;
-    EGLDisplay dpy;
-    EGLContext ctx;
-    EGLSurface surf;
-    EGLConfig cfg;
-    bool share;
-    void *reserved;     // For extension data in future versions.
-
-    static EGLDisplay getDisplay(QPaintDevice *device);
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_OPENGL_ES || QT_OPENVG
-
-#endif // QEGL_P_H
diff --git a/src/opengl/qegl_qws.cpp b/src/opengl/qegl_qws.cpp
deleted file mode 100644
index 89bee09..0000000
--- a/src/opengl/qegl_qws.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui/qpaintdevice.h>
-#include <QtGui/qpixmap.h>
-#include <QtGui/qwidget.h>
-#include "qegl_p.h"
-
-#if defined(QT_OPENGL_ES) || defined(QT_OPENVG)
-
-#include <qglscreen_qws.h>
-#include <qscreenproxy_qws.h>
-#include <private/qglwindowsurface_qws_p.h>
-#include <qapplication.h>
-#include <qdesktopwidget.h>
-
-QT_BEGIN_NAMESPACE
-
-static QGLScreen *glScreenForDevice(QPaintDevice *device)
-{
-    QScreen *screen = qt_screen;
-    if (screen->classId() == QScreen::MultiClass) {
-        int screenNumber;
-        if (device && device->devType() == QInternal::Widget)
-            screenNumber = qApp->desktop()->screenNumber(static_cast<QWidget *>(device));
-        else
-            screenNumber = 0;
-        screen = screen->subScreens()[screenNumber];
-    }
-    while (screen->classId() == QScreen::ProxyClass) {
-        screen = static_cast<QProxyScreen *>(screen)->screen();
-    }
-    if (screen->classId() == QScreen::GLClass)
-        return static_cast<QGLScreen *>(screen);
-    else
-        return 0;
-}
-
-// Create the surface for a QPixmap, QImage, or QWidget.
-bool QEglContext::createSurface(QPaintDevice *device)
-{
-    // Get the screen surface functions, which are used to create native ids.
-    QGLScreen *glScreen = glScreenForDevice(device);
-    if (!glScreen)
-        return false;
-    QGLScreenSurfaceFunctions *funcs = glScreen->surfaceFunctions();
-    if (!funcs)
-        return false;
-
-    // Create the native drawable for the paint device.
-    int devType = device->devType();
-    EGLNativePixmapType pixmapDrawable = 0;
-    EGLNativeWindowType windowDrawable = 0;
-    bool ok;
-    if (devType == QInternal::Pixmap) {
-        ok = funcs->createNativePixmap(static_cast<QPixmap *>(device), &pixmapDrawable);
-    } else if (devType == QInternal::Image) {
-        ok = funcs->createNativeImage(static_cast<QImage *>(device), &pixmapDrawable);
-    } else {
-        ok = funcs->createNativeWindow(static_cast<QWidget *>(device), &windowDrawable);
-    }
-    if (!ok) {
-        qWarning("QEglContext::createSurface(): Cannot create the native EGL drawable");
-        return false;
-    }
-
-    // Create the EGL surface to draw into, based on the native drawable.
-    if (devType == QInternal::Widget)
-        surf = eglCreateWindowSurface(dpy, cfg, windowDrawable, 0);
-    else
-        surf = eglCreatePixmapSurface(dpy, cfg, pixmapDrawable, 0);
-    if (surf == EGL_NO_SURFACE) {
-        qWarning("QEglContext::createSurface(): Unable to create EGL surface, error = 0x%x", eglGetError());
-        return false;
-    }
-    return true;
-}
-
-EGLDisplay QEglContext::getDisplay(QPaintDevice *device)
-{
-    Q_UNUSED(device);
-    return eglGetDisplay(EGLNativeDisplayType(EGL_DEFAULT_DISPLAY));
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_OPENGL_ES || QT_OPENVG
diff --git a/src/opengl/qegl_wince.cpp b/src/opengl/qegl_wince.cpp
deleted file mode 100644
index b978bc6..0000000
--- a/src/opengl/qegl_wince.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui/qpaintdevice.h>
-#include <QtGui/qpixmap.h>
-#include <QtGui/qwidget.h>
-#include "qegl_p.h"
-
-#if defined(QT_OPENGL_ES) || defined(QT_OPENVG)
-
-#include <windows.h>
-
-
-QT_BEGIN_NAMESPACE
-
-bool QEglContext::createSurface(QPaintDevice *device)
-{
-    // Create the native drawable for the paint device.
-    int devType = device->devType();
-    EGLNativePixmapType pixmapDrawable = 0;
-    EGLNativeWindowType windowDrawable = 0;
-    bool ok;
-    if (devType == QInternal::Pixmap) {
-        pixmapDrawable = 0;
-        ok = (pixmapDrawable != 0);
-    } else if (devType == QInternal::Widget) {
-        windowDrawable = (EGLNativeWindowType)(static_cast<QWidget *>(device))->winId();
-        ok = (windowDrawable != 0);
-    } else {
-        ok = false;
-    }
-    if (!ok) {
-        qWarning("QEglContext::createSurface(): Cannot create the native EGL drawable");
-        return false;
-    }
-
-    // Create the EGL surface to draw into, based on the native drawable.
-    if (devType == QInternal::Widget)
-        surf = eglCreateWindowSurface(dpy, cfg, windowDrawable, 0);
-    else
-        surf = eglCreatePixmapSurface(dpy, cfg, pixmapDrawable, 0);
-    if (surf == EGL_NO_SURFACE) {
-        qWarning("QEglContext::createSurface(): Unable to create EGL surface, error = 0x%x", eglGetError());
-        return false;
-    }
-    return true;
-}
-
-EGLDisplay QEglContext::getDisplay(QPaintDevice *device)
-{
-    EGLDisplay dpy = 0;
-    HWND win = ((QWidget*)device)->winId(); 
-    HDC myDc = GetDC(win); 
-    if (!myDc) { 
-        qWarning("QEglContext::defaultDisplay(): WinCE display is not open"); 
-    } 
-    dpy = eglGetDisplay(EGLNativeDisplayType(myDc)); 
-    if (dpy == EGL_NO_DISPLAY) { 
-        qWarning("QEglContext::defaultDisplay(): Falling back to EGL_DEFAULT_DISPLAY"); 
-        dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY); 
-    }
-    return dpy;
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_OPENGL_ES || QT_OPENVG
diff --git a/src/opengl/qegl_x11egl.cpp b/src/opengl/qegl_x11egl.cpp
deleted file mode 100644
index 23d1ac6..0000000
--- a/src/opengl/qegl_x11egl.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui/qpaintdevice.h>
-#include <QtGui/qpixmap.h>
-#include <QtGui/qwidget.h>
-#include <QtCore/qdebug.h>
-#include "qegl_p.h"
-
-#if defined(QT_OPENGL_ES) || defined(QT_OPENVG)
-
-#if defined(Q_WS_X11)
-#include <QtGui/qx11info_x11.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#endif
-
-QT_BEGIN_NAMESPACE
-
-bool QEglContext::createSurface(QPaintDevice *device)
-{
-    // Create the native drawable for the paint device.
-    int devType = device->devType();
-    EGLNativePixmapType pixmapDrawable = 0;
-    EGLNativeWindowType windowDrawable = 0;
-    bool ok;
-    if (devType == QInternal::Pixmap) {
-        pixmapDrawable = (EGLNativePixmapType)(static_cast<QPixmap *>(device))->handle();
-        ok = (pixmapDrawable != 0);
-    } else if (devType == QInternal::Widget) {
-        windowDrawable = (EGLNativeWindowType)(static_cast<QWidget *>(device))->winId();
-        ok = (windowDrawable != 0);
-    } else {
-        ok = false;
-    }
-    if (!ok) {
-        qWarning("QEglContext::createSurface(): Cannot create the native EGL drawable");
-        return false;
-    }
-
-    // Create the EGL surface to draw into, based on the native drawable.
-    if (devType == QInternal::Widget)
-        surf = eglCreateWindowSurface(dpy, cfg, windowDrawable, 0);
-    else
-        surf = eglCreatePixmapSurface(dpy, cfg, pixmapDrawable, 0);
-
-    if (surf == EGL_NO_SURFACE) {
-        qWarning() << "QEglContext::createSurface(): Unable to create EGL surface:"
-                   << errorString(eglGetError());
-        return false;
-    }
-    return true;
-}
-
-EGLDisplay QEglContext::getDisplay(QPaintDevice *device)
-{
-    Q_UNUSED(device);
-    Display *xdpy = QX11Info::display();
-    if (!xdpy) {
-        qWarning("QEglContext::getDisplay(): X11 display is not open");
-        return EGL_NO_DISPLAY;
-    }
-    return eglGetDisplay(EGLNativeDisplayType(xdpy));
-}
-
-static int countBits(unsigned long mask)
-{
-    int count = 0;
-    while (mask != 0) {
-        if (mask & 1)
-            ++count;
-        mask >>= 1;
-    }
-    return count;
-}
-
-// Set the pixel format parameters from the visual in "xinfo".
-void QEglProperties::setVisualFormat(const QX11Info *xinfo)
-{
-    if (!xinfo)
-        return;
-    Visual *visual = (Visual*)xinfo->visual();
-    if (!visual)
-        return;
-    if (visual->c_class != TrueColor && visual->c_class != DirectColor)
-        return;
-    setValue(EGL_RED_SIZE, countBits(visual->red_mask));
-    setValue(EGL_GREEN_SIZE, countBits(visual->green_mask));
-    setValue(EGL_BLUE_SIZE, countBits(visual->blue_mask));
-    setValue(EGL_ALPHA_SIZE, 0);    // XXX
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_OPENGL_ES || QT_OPENVG
diff --git a/src/opengl/qgl_egl_p.h b/src/opengl/qgl_egl_p.h
index 2fb2e8f..d54036d 100644
--- a/src/opengl/qgl_egl_p.h
+++ b/src/opengl/qgl_egl_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qegl_p.h"
+#include <QtGui/private/qegl_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/opengl/qgl_qws.cpp b/src/opengl/qgl_qws.cpp
index 3b6ad63..a71a734 100644
--- a/src/opengl/qgl_qws.cpp
+++ b/src/opengl/qgl_qws.cpp
@@ -116,6 +116,57 @@ void qt_egl_add_platform_config(QEglProperties& props, QPaintDevice *device)
         props.setPixelFormat(glScreen->pixelFormat());
 }
 
+static bool qt_egl_create_surface
+    (QEglContext *context, QPaintDevice *device,
+     const QEglProperties *properties = 0)
+{
+    // Get the screen surface functions, which are used to create native ids.
+    QGLScreen *glScreen = glScreenForDevice(device);
+    if (!glScreen)
+        return false;
+    QGLScreenSurfaceFunctions *funcs = glScreen->surfaceFunctions();
+    if (!funcs)
+        return false;
+
+    // Create the native drawable for the paint device.
+    int devType = device->devType();
+    EGLNativePixmapType pixmapDrawable = 0;
+    EGLNativeWindowType windowDrawable = 0;
+    bool ok;
+    if (devType == QInternal::Pixmap) {
+        ok = funcs->createNativePixmap(static_cast<QPixmap *>(device), &pixmapDrawable);
+    } else if (devType == QInternal::Image) {
+        ok = funcs->createNativeImage(static_cast<QImage *>(device), &pixmapDrawable);
+    } else {
+        ok = funcs->createNativeWindow(static_cast<QWidget *>(device), &windowDrawable);
+    }
+    if (!ok) {
+        qWarning("QEglContext::createSurface(): Cannot create the native EGL drawable");
+        return false;
+    }
+
+    // Create the EGL surface to draw into, based on the native drawable.
+    const int *props;
+    if (properties)
+        props = properties->properties();
+    else
+        props = 0;
+    EGLSurface surf;
+    if (devType == QInternal::Widget) {
+        surf = eglCreateWindowSurface
+            (context->display(), context->config(), windowDrawable, props);
+    } else {
+        surf = eglCreatePixmapSurface
+            (context->display(), context->config(), pixmapDrawable, props);
+    }
+    if (surf == EGL_NO_SURFACE) {
+        qWarning("QEglContext::createSurface(): Unable to create EGL surface, error = 0x%x", eglGetError());
+        return false;
+    }
+    context->setSurface(surf);
+    return true;
+}
+
 bool QGLContext::chooseContext(const QGLContext* shareContext)
 {
     Q_D(QGLContext);
@@ -131,7 +182,7 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
 
     // Get the display and initialize it.
     d->eglContext = new QEglContext();
-    d->eglContext->setApi(QEglContext::OpenGL);
+    d->eglContext->setApi(QEgl::OpenGL);
     if (!d->eglContext->openDisplay(device())) {
         delete d->eglContext;
         d->eglContext = 0;
@@ -142,7 +193,7 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
     QEglProperties configProps;
     qt_egl_add_platform_config(configProps, device());
     qt_egl_set_format(configProps, devType, d->glFormat);
-    configProps.setRenderableType(QEglContext::OpenGL);
+    configProps.setRenderableType(QEgl::OpenGL);
 
     // Search for a matching configuration, reducing the complexity
     // each time until we get something that matches.
@@ -168,8 +219,10 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
         eglSwapInterval(d->eglContext->display(), d->glFormat.swapInterval());
 #endif
 
-    // Create the EGL surface to draw into.
-    if (!d->eglContext->createSurface(device())) {
+    // Create the EGL surface to draw into.  We cannot use
+    // QEglContext::createSurface() because it does not have
+    // access to the QGLScreen.
+    if (!qt_egl_create_surface(d->eglContext, device())) {
         delete d->eglContext;
         d->eglContext = 0;
         return false;
diff --git a/src/opengl/qgl_wince.cpp b/src/opengl/qgl_wince.cpp
index 47dc2d4..afe26ab 100644
--- a/src/opengl/qgl_wince.cpp
+++ b/src/opengl/qgl_wince.cpp
@@ -140,7 +140,7 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
 
     // Get the display and initialize it.
     d->eglContext = new QEglContext();
-    d->eglContext->setApi(QEglContext::OpenGL);
+    d->eglContext->setApi(QEgl::OpenGL);
     if (!d->eglContext->openDisplay(device())) {
         delete d->eglContext;
         d->eglContext = 0;
@@ -151,7 +151,7 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
     QEglProperties configProps;
     qt_egl_add_platform_config(configProps, device());
     qt_egl_set_format(configProps, devType, d->glFormat);
-    configProps.setRenderableType(QEglContext::OpenGL);
+    configProps.setRenderableType(QEgl::OpenGL);
 
     // Search for a matching configuration, reducing the complexity
     // each time until we get something that matches.
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 7fdbfbd..9db3a30 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -77,7 +77,7 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
 
     // Get the display and initialize it.
     d->eglContext = new QEglContext();
-    d->eglContext->setApi(QEglContext::OpenGL);
+    d->eglContext->setApi(QEgl::OpenGL);
     if (!d->eglContext->openDisplay(device())) {
         delete d->eglContext;
         d->eglContext = 0;
@@ -88,11 +88,11 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
     QEglProperties configProps;
     qt_egl_set_format(configProps, devType, d->glFormat);
     qt_egl_add_platform_config(configProps, device());
-    configProps.setRenderableType(QEglContext::OpenGL);
+    configProps.setRenderableType(QEgl::OpenGL);
 
     // Search for a matching configuration, reducing the complexity
     // each time until we get something that matches.
-    if (!d->eglContext->chooseConfig(configProps, QEglContext::BestPixelFormat)) {
+    if (!d->eglContext->chooseConfig(configProps, QEgl::BestPixelFormat)) {
         delete d->eglContext;
         d->eglContext = 0;
         return false;
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);
 }