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:
  Port QX11GLPixmapData & QX11GLWindowSurface to new QEgl API
  Make QEgl::createSurface store the surface in the pixmapdata too
  Make QEgl::ConfigOptions use QFlags

1 files changed, 9 insertions, 6 deletions

diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp
index 7bfcf27..91b271b 100644
--- a/src/opengl/qgl_egl.cpp
+++ b/src/opengl/qgl_egl.cpp
@@ -210,23 +210,26 @@ void QGLContextPrivate::destroyEglSurfaceForDevice()
 
 EGLSurface QGLContextPrivate::eglSurfaceForDevice() const
 {
-    if (paintDevice->devType() == QInternal::Widget)
+    // If a QPixmapData had to create the QGLContext, we don't have a paintDevice
+    if (!paintDevice)
         return eglSurface;
-    if (paintDevice->devType() == QInternal::Pixmap) {
+
 #ifdef Q_WS_X11
+    if (paintDevice->devType() == QInternal::Pixmap) {
         QPixmapData *pmd = static_cast<QPixmap*>(paintDevice)->data_ptr().data();
         if (pmd->classId() == QPixmapData::X11Class) {
             QX11PixmapData* x11PixmapData = static_cast<QX11PixmapData*>(pmd);
             return (EGLSurface)x11PixmapData->gl_surface;
-        } else
-#endif
-            return eglSurface;
+        }
     }
+#endif
+
     if (paintDevice->devType() == QInternal::Pbuffer) {
         QGLPixelBuffer* pbuf = static_cast<QGLPixelBuffer*>(paintDevice);
         return pbuf->d_func()->pbuf;
     }
-    return EGL_NO_SURFACE;
+
+    return eglSurface;
 }
 
 void QGLWidget::setMouseTracking(bool enable)