diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 13:29:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 13:29:31 (GMT) |
| commit | 324328c7cc4a8ef7e1305877ad5865faebab7302 (patch) | |
| tree | 4216fb0c499f8c3c9d32aae86d43a6d809cb647a | |
| parent | eb018fdc114f5c4f30c19ad168dd029c8d1e98e8 (diff) | |
| parent | c8df7acf91576e9fd517ac843ba76ca195fdbbd0 (diff) | |
| download | Qt-324328c7cc4a8ef7e1305877ad5865faebab7302.zip Qt-324328c7cc4a8ef7e1305877ad5865faebab7302.tar.gz Qt-324328c7cc4a8ef7e1305877ad5865faebab7302.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
Handle removal of setter for partialUpdateSupport
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 4ac7b22..2ccbc50 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -494,7 +494,7 @@ void QGLWindowSurface::hijackWindow(QWidget *widget) bool swapBehaviourPreserved = (ctx->d_func()->eglContext->configAttrib(EGL_SWAP_BEHAVIOR) != EGL_BUFFER_PRESERVED) || (ctx->d_func()->eglContext->configAttrib(EGL_SURFACE_TYPE)&EGL_SWAP_BEHAVIOR_PRESERVED_BIT); if (!swapBehaviourPreserved && !haveNOKSwapRegion) - setPartialUpdateSupport(false); // Force full-screen updates + d_ptr->partialUpdateSupport = false; // Force full-screen updates else d_ptr->partialUpdateSupport = true; #else |