summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2009-09-14 13:00:39 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2009-09-14 13:02:01 (GMT)
commitc72eaee91136bbe1a9fa99cdb0a7593bec60264b (patch)
tree68ac62966fc3dcc72b37c1f0f735b99db43da27d
parent3d915e734aaab1a208cd6a823c5e6923d05a2831 (diff)
downloadQt-c72eaee91136bbe1a9fa99cdb0a7593bec60264b.zip
Qt-c72eaee91136bbe1a9fa99cdb0a7593bec60264b.tar.gz
Qt-c72eaee91136bbe1a9fa99cdb0a7593bec60264b.tar.bz2
Fixed clipping bug in portedcanvas with -graphicssystem opengl
We need to call ensureActive() when save() is called, to make sure systemStateChanged() gets called and updates the scissorTestEnabled flag, so that we don't lose it on the next restore(). Task-number: 261113 Reviewed-by: Trond
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index ea5bec8..bbb285f 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1720,6 +1720,9 @@ QPainterState *QGL2PaintEngineEx::createState(QPainterState *orig) const
{
Q_D(const QGL2PaintEngineEx);
+ if (orig)
+ const_cast<QGL2PaintEngineEx *>(this)->syncState();
+
QOpenGL2PaintEngineState *s;
if (!orig)
s = new QOpenGL2PaintEngineState();