diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 06:38:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 06:38:58 (GMT) |
| commit | 9754c200aa325614e05e6b00e3adedbdda1d161a (patch) | |
| tree | 9298314e82171bccdd6568c0385d238086e21cbc /src/opengl | |
| parent | eb126c11c72c82baf55f4b62e69cb138f4dce059 (diff) | |
| parent | f505196fdec6a0d855eb554a92f5e03b61df1e68 (diff) | |
| download | Qt-9754c200aa325614e05e6b00e3adedbdda1d161a.zip Qt-9754c200aa325614e05e6b00e3adedbdda1d161a.tar.gz Qt-9754c200aa325614e05e6b00e3adedbdda1d161a.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(); |