diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:03:27 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:03:27 (GMT) |
commit | e5bcddb6fecc1fb55f18f734601a3e928dc7510a (patch) | |
tree | 4c6fd15be926b48ca7e962c51024a1bea9bae649 /src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | |
parent | 468bd5ac176c42af310d439810bbd3bb561f5a1b (diff) | |
parent | 3945fd75a93d790434b33c2d23add155893a82a4 (diff) | |
download | Qt-e5bcddb6fecc1fb55f18f734601a3e928dc7510a.zip Qt-e5bcddb6fecc1fb55f18f734601a3e928dc7510a.tar.gz Qt-e5bcddb6fecc1fb55f18f734601a3e928dc7510a.tar.bz2 |
Merge branch '4.6'
Conflicts:
tools/assistant/translations/translations_adp.pro
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h')
-rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index 28c972e..46be398 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -223,6 +223,7 @@ public: bool shaderMatrixUniformDirty; bool opacityUniformDirty; + bool stencilClean; // Has the stencil not been used for clipping so far? QRegion dirtyStencilRegion; QRect currentScissorBounds; uint maxClip; |