diff options
| author | Samuel Rødal <[email protected]> | 2011-07-15 14:07:12 +0200 |
|---|---|---|
| committer | Jørgen Lind <[email protected]> | 2011-07-19 09:50:37 +0200 |
| commit | 310519d6d11da546b23c1cba307f37c24e0a5c0b (patch) | |
| tree | 3118b6539107ba0541abd09005bacc4e592a27e0 /src/opengl/qgl_egl.cpp | |
| parent | 5abf4f55b1bd1180ea2dbfb867a48364bc89af80 (diff) | |
Rename QPixmapData to QPlatformPixmap.
Makes the API symmetric with the other Lighthouse APIs.
Change-Id: I8a399f3c968ea35d4624711b31f2ac5bb94b7893
Reviewed-on: http://codereview.qt.nokia.com/1735
Reviewed-by: Qt Sanity Bot <[email protected]>
Reviewed-by: Jørgen Lind <[email protected]>
Diffstat (limited to 'src/opengl/qgl_egl.cpp')
| -rw-r--r-- | src/opengl/qgl_egl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp index 34b448e0481..dcf340fb108 100644 --- a/src/opengl/qgl_egl.cpp +++ b/src/opengl/qgl_egl.cpp @@ -280,16 +280,16 @@ void QGLContextPrivate::destroyEglSurfaceForDevice() EGLSurface QGLContextPrivate::eglSurfaceForDevice() const { - // If a QPixmapData had to create the QGLContext, we don't have a paintDevice + // If a QPlatformPixmap had to create the QGLContext, we don't have a paintDevice if (!paintDevice) return eglSurface; #ifdef Q_WS_X11 if (paintDevice->devType() == QInternal::Pixmap) { - QPixmapData *pmd = static_cast<QPixmap*>(paintDevice)->data_ptr().data(); - if (pmd->classId() == QPixmapData::X11Class) { - QX11PixmapData* x11PixmapData = static_cast<QX11PixmapData*>(pmd); - return (EGLSurface)x11PixmapData->gl_surface; + QPlatformPixmap *pmd = static_cast<QPixmap*>(paintDevice)->data_ptr().data(); + if (pmd->classId() == QPlatformPixmap::X11Class) { + QX11PlatformPixmap* x11PlatformPixmap = static_cast<QX11PlatformPixmap*>(pmd); + return (EGLSurface)x11PlatformPixmap->gl_surface; } } #endif |