summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
diff options
context:
space:
mode:
authorSarah Smith <sarah.j.smith@nokia.com>2009-09-16 01:40:18 (GMT)
committerSarah Smith <sarah.j.smith@nokia.com>2009-09-16 01:40:18 (GMT)
commita7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34 (patch)
tree0ccc262ac7d0d825d1a8c6868307affa444a9e75 /src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
parent227dd18f0e25ee522e5a4323e849590a314dd4cd (diff)
parenta4571547a38d68d6778bf0ebfa4dc26cc3d865a3 (diff)
downloadQt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.zip
Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.tar.gz
Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp')
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 5e790cf..e41d0b4 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1385,6 +1385,7 @@ void QGL2PaintEngineEx::ensureActive()
d->device->ensureActiveTarget();
if (d->needsSync) {
+ d->transferMode(BrushDrawingMode);
glViewport(0, 0, d->width, d->height);
glDepthMask(false);
glDepthFunc(GL_LESS);