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:
  Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGL
  Added clipping to the dashed stroke processor in the GL2 engine.
  Fixed assert failure when drawing dashes with raster engine.
  Update tst_QGL::getSetCheck to check for new (correct) behaviour
  Update QGLFormat from EGLConfig properly
  Make calls to QGLFormat::set*BufferSize also update flags
  Compile fix when Qt3Support is enabled for devices using EGL.
  Cocoa: Fix misaligned text between format changes
  Added configure check to diasable building QtDeclarative
  Fixes Q3ListViewItem grandchildren not sorted if item has one child
  Compile with Qt3Support in a ScratchBox environment.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/opengl/qgl_qws.cpp b/src/opengl/qgl_qws.cpp
index f72f051..96b2454 100644
--- a/src/opengl/qgl_qws.cpp
+++ b/src/opengl/qgl_qws.cpp
@@ -200,7 +200,7 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
     }
 
     // Inform the higher layers about the actual format properties.
-    qt_egl_update_format(*(d->eglContext), d->glFormat);
+    qt_glformat_from_eglconfig(d->glFormat, d->eglContext->config());
 
     // Create a new context for the configuration.
     if (!d->eglContext->createContext