summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorMichael Dominic K <mdk@codethink.co.uk>2010-07-21 09:17:33 (GMT)
committerTrond Kjernåsen <trond.kjernasen@nokia.com>2010-07-26 14:09:51 (GMT)
commitd6203cfeb0e096575c1fc0254dddc07a3d65d24c (patch)
treeda3cf71a7498e52dc8cdef2867d64ef28dd42073 /src/opengl
parent2ecb7eebdc950eb559b9203d70077301b8b5a3b1 (diff)
downloadQt-d6203cfeb0e096575c1fc0254dddc07a3d65d24c.zip
Qt-d6203cfeb0e096575c1fc0254dddc07a3d65d24c.tar.gz
Qt-d6203cfeb0e096575c1fc0254dddc07a3d65d24c.tar.bz2
Do check after all if we have partialUpdateSupport.
Task-number: QTBUG-12266 Merge-request: 752 Reviewed-by: Trond
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qwindowsurface_gl.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index e9da452..6b82ed3 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -494,10 +494,9 @@ void QGLWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint &
}
}
#endif
- if (d_ptr->paintedRegion.boundingRect() != geometry()) {
- // Emits warning if not supported. Should never happen unless
- // setPartialUpdateSupport(true) has been called.
- context()->d_func()->swapRegion(&d_ptr->paintedRegion);
+ if (d_ptr->paintedRegion.boundingRect() != geometry() &&
+ hasPartialUpdateSupport()) {
+ context()->d_func()->swapRegion(&d_ptr->paintedRegion);
} else
context()->swapBuffers();