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, 5 insertions, 1 deletions

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 73cd6a8..7839191 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -766,6 +766,7 @@ void QGLFormat::setSamples(int numSamples)
         return;
     }
     d->numSamples = numSamples;
+    setSampleBuffers(numSamples > 0);
 }
 
 /*!
@@ -904,6 +905,7 @@ void QGLFormat::setDepthBufferSize(int size)
         return;
     }
     d->depthSize = size;
+    setDepth(size > 0);
 }
 
 /*!
@@ -1017,7 +1019,7 @@ void QGLFormat::setAlphaBufferSize(int size)
         return;
     }
     d->alphaSize = size;
-    setOption(QGL::AlphaChannel);
+    setAlpha(size > 0);
 }
 
 /*!
@@ -1044,6 +1046,7 @@ void QGLFormat::setAccumBufferSize(int size)
         return;
     }
     d->accumSize = size;
+    setAccum(size > 0);
 }
 
 /*!
@@ -1069,6 +1072,7 @@ void QGLFormat::setStencilBufferSize(int size)
         return;
     }
     d->stencilSize = size;
+    setStencil(size > 0);
 }
 
 /*!