Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
	src/multimedia/audio/qaudioformat.cpp

3 files changed, 70 insertions, 69 deletions

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 7ff0ef2..6b65886 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -559,6 +559,9 @@ void QGL2PaintEngineExPrivate::resetGLState()
     glDepthMask(true);
     glDepthFunc(GL_LESS);
     glClearDepth(1);
+    glStencilMask(0xff);
+    glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+    glStencilFunc(GL_ALWAYS, 0, 0xff);
 }
 
 void QGL2PaintEngineEx::endNativePainting()
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 8944c1b..547b33e 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -4952,8 +4952,6 @@ void QGLWidgetPrivate::initContext(QGLContext *context, const QGLWidget* shareWi
 
     if (!glcx)
         glcx = new QGLContext(QGLFormat::defaultFormat(), q);
-
-    q->setAttribute(Qt::WA_NoSystemBackground);
 }
 
 #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 0d3a892..85daf95 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -56,9 +56,9 @@ QT_BEGIN_NAMESPACE
 bool qt_egl_setup_x11_visual(XVisualInfo &vi, EGLDisplay display, EGLConfig config,
                              const QX11Info &x11Info, bool useArgbVisual);
 //
-// QGLTempContext is a lass for creating a temporary GL context (which is
-// needed during QGLWidget initialization to retrieve GL extension info).
-// Faster to construct than a full QGLWidget.
+// QGLTempContext is a class for creating a temporary GL context
+// (which is needed during QGLWidget initialization to retrieve GL
+// extension info).  Faster to construct than a full QGLWidget.
 //
 class QGLTempContext
 {
@@ -68,82 +68,82 @@ public:
         window(0),
         context(0),
         surface(0)
-        {
-            display = eglGetDisplay(EGLNativeDisplayType(X11->display));
+    {
+        display = eglGetDisplay(EGLNativeDisplayType(X11->display));
 
-            if (!eglInitialize(display, NULL, NULL)) {
-                qWarning("QGLTempContext: Unable to initialize EGL display.");
-                return;
-            }
+        if (!eglInitialize(display, NULL, NULL)) {
+            qWarning("QGLTempContext: Unable to initialize EGL display.");
+            return;
+        }
 
-            EGLConfig config;
-            int numConfigs = 0;
-            EGLint attribs[] = {
-                EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGLConfig config;
+        int numConfigs = 0;
+        EGLint attribs[] = {
+            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
 #ifdef QT_OPENGL_ES_2
-                EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
 #endif
-                EGL_NONE
-            };
+            EGL_NONE
+        };
 
-            eglChooseConfig(display, attribs, &config, 1, &numConfigs);
-            if (!numConfigs) {
-                qWarning("QGLTempContext: No EGL configurations available.");
-                return;
-            }
+        eglChooseConfig(display, attribs, &config, 1, &numConfigs);
+        if (!numConfigs) {
+            qWarning("QGLTempContext: No EGL configurations available.");
+            return;
+        }
 
-            XVisualInfo visualInfo;
-            XVisualInfo *vi;
-            int numVisuals;
-            EGLint id = 0;
-
-            eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &id);
-            if (id == 0) {
-                // EGL_NATIVE_VISUAL_ID is optional and might not be supported
-                // on some implementations - we'll have to do it the hard way
-                QX11Info xinfo;
-                qt_egl_setup_x11_visual(visualInfo, display, config, xinfo, false);
-            } else {
-                visualInfo.visualid = id;
-            }
-            vi = XGetVisualInfo(X11->display, VisualIDMask, &visualInfo, &numVisuals);
-            if (!vi || numVisuals < 1) {
-                qWarning("QGLTempContext: Unable to get X11 visual info id.");
-                return;
-            }
+        XVisualInfo visualInfo;
+        XVisualInfo *vi;
+        int numVisuals;
+        EGLint id = 0;
+
+        eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &id);
+        if (id == 0) {
+            // EGL_NATIVE_VISUAL_ID is optional and might not be supported
+            // on some implementations - we'll have to do it the hard way
+            QX11Info xinfo;
+            qt_egl_setup_x11_visual(visualInfo, display, config, xinfo, false);
+        } else {
+            visualInfo.visualid = id;
+        }
+        vi = XGetVisualInfo(X11->display, VisualIDMask, &visualInfo, &numVisuals);
+        if (!vi || numVisuals < 1) {
+            qWarning("QGLTempContext: Unable to get X11 visual info id.");
+            return;
+        }
 
-            window = XCreateWindow(X11->display, RootWindow(X11->display, screen),
-                                   0, 0, 1, 1, 0,
-                                   vi->depth, InputOutput, vi->visual,
-                                   0, 0);
+        window = XCreateWindow(X11->display, RootWindow(X11->display, screen),
+                               0, 0, 1, 1, 0,
+                               vi->depth, InputOutput, vi->visual,
+                               0, 0);
 
-            surface = eglCreateWindowSurface(display, config, (EGLNativeWindowType) window, NULL);
+        surface = eglCreateWindowSurface(display, config, (EGLNativeWindowType) window, NULL);
 
-            if (surface == EGL_NO_SURFACE) {
-                qWarning("QGLTempContext: Error creating EGL surface.");
-                XFree(vi);
-                XDestroyWindow(X11->display, window);
-                return;
-            }
+        if (surface == EGL_NO_SURFACE) {
+            qWarning("QGLTempContext: Error creating EGL surface.");
+            XFree(vi);
+            XDestroyWindow(X11->display, window);
+            return;
+        }
 
-            EGLint contextAttribs[] = {
+        EGLint contextAttribs[] = {
 #ifdef QT_OPENGL_ES_2
-                EGL_CONTEXT_CLIENT_VERSION, 2,
+            EGL_CONTEXT_CLIENT_VERSION, 2,
 #endif
-                EGL_NONE
-            };
-            context = eglCreateContext(display, config, 0, contextAttribs);
-            if (context != EGL_NO_CONTEXT
-                && eglMakeCurrent(display, surface, surface, context))
-            {
-                initialized = true;
-            } else {
-                qWarning("QGLTempContext: Error creating EGL context.");
-                eglDestroySurface(display, surface);
-                XDestroyWindow(X11->display, window);
-            }
-            XFree(vi);
+            EGL_NONE
+        };
+        context = eglCreateContext(display, config, 0, contextAttribs);
+        if (context != EGL_NO_CONTEXT
+            && eglMakeCurrent(display, surface, surface, context))
+        {
+            initialized = true;
+        } else {
+            qWarning("QGLTempContext: Error creating EGL context.");
+            eglDestroySurface(display, surface);
+            XDestroyWindow(X11->display, window);
         }
+        XFree(vi);
+    }
 
     ~QGLTempContext() {
         if (initialized) {
@@ -349,7 +349,7 @@ bool qt_egl_setup_x11_visual(XVisualInfo &vi, EGLDisplay display, EGLConfig conf
 
     // If EGL does not know the visual ID, so try to select an appropriate one ourselves, first
     // using XRender if we're supposed to have an alpha, then falling back to XGetVisualInfo
-          
+
 #if !defined(QT_NO_XRENDER)
     if (vi.visualid == 0 && useArgbVisual) {
         // Try to use XRender to find an ARGB visual we can use