diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-23 19:07:09 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-23 19:07:09 (GMT) |
commit | 20c6b8ffcf90602127e9b524f3828dc6b6e0f59b (patch) | |
tree | 490cb48372a493261d58636cc623954ea04b0bfc /src/opengl | |
parent | f20b9460e1e67a0ddd7e4e69224722d5b8c3f5c9 (diff) | |
parent | 8d99d5243be13cfe4a44184602c0fd66704d1c63 (diff) | |
download | Qt-20c6b8ffcf90602127e9b524f3828dc6b6e0f59b.zip Qt-20c6b8ffcf90602127e9b524f3828dc6b6e0f59b.tar.gz Qt-20c6b8ffcf90602127e9b524f3828dc6b6e0f59b.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
Updated QtGUI DEF files for WINSCW
Handle removal of setter for partialUpdateSupport
Updated QtGUI DEF files for WINSCW
Handle removal of setter for partialUpdateSupport
Updated DEF files for Symbian
Diffstat (limited to 'src/opengl')
-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 |