diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-21 08:14:18 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-21 08:15:36 (GMT) |
| commit | a17b1d7c18737de1b3c6122a1f9766cbaa0d7c26 (patch) | |
| tree | 5d948c0d4127cb4d0945ca1d446cff13bf345433 | |
| parent | bc786ded04aa316f99cf9ac4cf8b714ee46575b5 (diff) | |
| download | Qt-a17b1d7c18737de1b3c6122a1f9766cbaa0d7c26.zip Qt-a17b1d7c18737de1b3c6122a1f9766cbaa0d7c26.tar.gz Qt-a17b1d7c18737de1b3c6122a1f9766cbaa0d7c26.tar.bz2 | |
Less ugly hack to make QtOpenGL compile on Lighthouse
This cleans up after commit bc5f5d99078d9ca1f4fc80fc7d0fe753d5ef396a
| -rw-r--r-- | src/gui/painting/qwindowsurface_p.h | 1 | ||||
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/painting/qwindowsurface_p.h b/src/gui/painting/qwindowsurface_p.h index da02f5a..c845021 100644 --- a/src/gui/painting/qwindowsurface_p.h +++ b/src/gui/painting/qwindowsurface_p.h @@ -86,6 +86,7 @@ public: #else virtual void resize(const QSize &size); QSize size() const; + inline QRect geometry() const { return QRect(QPoint(), size()); } //### cleanup before Qt 5 #endif virtual bool scroll(const QRegion &area, int dx, int dy); 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(); |