diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-21 14:16:32 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-21 14:16:32 (GMT) |
| commit | 05e8e8056824dfa56830e12a6a50ec39018df6fc (patch) | |
| tree | f1ad05f7600ed63f392c6bbb08bea54f2dd36b82 /src/opengl | |
| parent | 3d0c33f70fb60095f9a1065eceb1ae1aa854af2d (diff) | |
| parent | 77d17d054b8baff411613206a099af36f8e0bc43 (diff) | |
| download | Qt-05e8e8056824dfa56830e12a6a50ec39018df6fc.zip Qt-05e8e8056824dfa56830e12a6a50ec39018df6fc.tar.gz Qt-05e8e8056824dfa56830e12a6a50ec39018df6fc.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 8c54fd1..6571a76 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -499,13 +499,11 @@ void QGLWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint & } } #endif -#ifndef Q_WS_QPA //############################################### 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); } else -#endif context()->swapBuffers(); d_ptr->paintedRegion = QRegion(); |