diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 19:42:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 19:42:23 (GMT) |
| commit | f505196fdec6a0d855eb554a92f5e03b61df1e68 (patch) | |
| tree | a8c84cc8e9ad82c9f6a777c679a6f390404be75d /src/opengl | |
| parent | 591807899deb3fc479bd32722756f74b899977d5 (diff) | |
| parent | 7bf2de5adf62f45c8d7fcba22e2cf9ea427b5b37 (diff) | |
| download | Qt-f505196fdec6a0d855eb554a92f5e03b61df1e68.zip Qt-f505196fdec6a0d855eb554a92f5e03b61df1e68.tar.gz Qt-f505196fdec6a0d855eb554a92f5e03b61df1e68.tar.bz2 | |
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:
Adding a threshold for partial updates.
Fixed arm X11 build.
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index f98dcff..8157b2a 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -534,8 +534,9 @@ void QGLWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint & } } #endif - if (d_ptr->paintedRegion.boundingRect() != geometry() && - hasPartialUpdateSupport()) { + if (hasPartialUpdateSupport() && + d_ptr->paintedRegion.boundingRect().width() * d_ptr->paintedRegion.boundingRect().height() < + geometry().width() * geometry().height() * 0.2) { context()->d_func()->swapRegion(&d_ptr->paintedRegion); } else context()->swapBuffers(); |