diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 23:12:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 23:12:24 (GMT) |
| commit | 80341e9ce0ec98dd59806dbad3674e3dad067c87 (patch) | |
| tree | 49d7da7c8e71f721a35e50e7a61fcf89f02392ce /src/opengl/qgl_egl.cpp | |
| parent | db14623485396fd69839e519184b794775b65b01 (diff) | |
| parent | 3f744a4e816b8a7850e8c0479b254a8e6bd2e74f (diff) | |
| download | Qt-80341e9ce0ec98dd59806dbad3674e3dad067c87.zip Qt-80341e9ce0ec98dd59806dbad3674e3dad067c87.tar.gz Qt-80341e9ce0ec98dd59806dbad3674e3dad067c87.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QtDFB: Make transparent windows behave better
For meego graphics system, use floyd-steinberg dithering when converting to 16bit.
Added support for blitting to native child widgets in GL window surface.
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) |