Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix & move QEgl::native* to platform-specific files
  Updates to changes file
  Make bindTextureFromNativePixmap use new QEgl APIs
  Move QGLWidget::setContext logic into QEgl & QGLContext
  Move EGL surface type setting to new QEglProperties::setDeviceType
  Replace qt_egl_add_platform_config with existing QEglProperties API
  Use QEgl::display in QGLTemporaryContext so EGL is init'd only once
  Remove qt_egl_setup_x11_visual
  Make QGLWidget use new QEgl::getCompatibleVisualId API
  Add QEglContext::configAttrib(int name) helper
  Add getCompatibleVisualId to QEgl on X11
  Add QEgl::defaultConfig method to select configs suitable for Qt
  Make QEgl::createSurface cross-platform and add native getters
  Move chooseConfig and createSurface logic to QEgl functions
  Move static methods from QEglContext to QEgl namespace
  Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.h

1 files changed, 6 insertions, 4 deletions

diff --git a/src/opengl/qglpixelbuffer_egl.cpp b/src/opengl/qglpixelbuffer_egl.cpp
index 954049d..ee0714f 100644
--- a/src/opengl/qglpixelbuffer_egl.cpp
+++ b/src/opengl/qglpixelbuffer_egl.cpp
@@ -82,7 +82,8 @@ bool QGLPixelBufferPrivate::init(const QSize &size, const QGLFormat &f, QGLWidge
 #endif
     } else {
         QEglProperties configProps;
-        qt_egl_set_format(configProps, QInternal::Pbuffer, f);
+        qt_eglproperties_set_glformat(configProps, f);
+        configProps.setDeviceType(QInternal::Pbuffer);
         configProps.setRenderableType(ctx->api());
         bool ok = false;
 #if QGL_RENDER_TEXTURE
@@ -137,7 +138,7 @@ bool QGLPixelBufferPrivate::init(const QSize &size, const QGLFormat &f, QGLWidge
     }
 #endif
     if (pbuf == EGL_NO_SURFACE) {
-        qWarning() << "QGLPixelBufferPrivate::init(): Unable to create EGL pbuffer surface:" << QEglContext::errorString(eglGetError());
+        qWarning() << "QGLPixelBufferPrivate::init(): Unable to create EGL pbuffer surface:" << QEgl::errorString();
         return false;
     }
 
@@ -204,11 +205,12 @@ GLuint QGLPixelBuffer::generateDynamicTexture() const
 bool QGLPixelBuffer::hasOpenGLPbuffers()
 {
     // See if we have at least 1 configuration that matches the default format.
-    EGLDisplay dpy = QEglContext::display();
+    EGLDisplay dpy = QEgl::display();
     if (dpy == EGL_NO_DISPLAY)
         return false;
     QEglProperties configProps;
-    qt_egl_set_format(configProps, QInternal::Pbuffer, QGLFormat::defaultFormat());
+    qt_eglproperties_set_glformat(configProps, QGLFormat::defaultFormat());
+    configProps.setDeviceType(QInternal::Pbuffer);
     configProps.setRenderableType(QEgl::OpenGL);
     do {
         EGLConfig cfg = 0;