diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 01:16:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 01:16:18 (GMT) |
| commit | 9e17ec82f6915a636338c8be693773ec21db3a92 (patch) | |
| tree | 46bde7e8b2b5b522b4710d895bf38a0d384f37e0 /src/opengl/qgl_egl.cpp | |
| parent | d67a5534cb50f66807b87526d42603c7d4df3595 (diff) | |
| parent | ef704ebad66559170d761459d42d6c99996db529 (diff) | |
| download | Qt-9e17ec82f6915a636338c8be693773ec21db3a92.zip Qt-9e17ec82f6915a636338c8be693773ec21db3a92.tar.gz Qt-9e17ec82f6915a636338c8be693773ec21db3a92.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/opengl/qgl_egl.cpp')
| -rw-r--r-- | src/opengl/qgl_egl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp index c79c4cd..27f7ad9 100644 --- a/src/opengl/qgl_egl.cpp +++ b/src/opengl/qgl_egl.cpp @@ -276,12 +276,12 @@ EGLSurface QGLContextPrivate::eglSurfaceForDevice() const return eglSurface; } -void QGLContextPrivate::swapRegion(const QRegion *region) +void QGLContextPrivate::swapRegion(const QRegion ®ion) { if (!valid || !eglContext) return; - eglContext->swapBuffersRegion2NOK(eglSurfaceForDevice(), region); + eglContext->swapBuffersRegion2NOK(eglSurfaceForDevice(), ®ion); } void QGLWidget::setMouseTracking(bool enable) |