diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-03-08 14:26:33 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-03-10 09:53:07 (GMT) |
| commit | 4737daef1c8d7a181117d6482f5b57cfc433e050 (patch) | |
| tree | a9b2fbe71b2eee2d0e80ad11fa4e28960c10764e /src/gui/image | |
| parent | 79a83854bcae35c22e02212a775fcbf825c1439d (diff) | |
| download | Qt-4737daef1c8d7a181117d6482f5b57cfc433e050.zip Qt-4737daef1c8d7a181117d6482f5b57cfc433e050.tar.gz Qt-4737daef1c8d7a181117d6482f5b57cfc433e050.tar.bz2 | |
Handle EGLSurfaces better, including more error detection
Note: This changes QX11PixmapData::gl_surface to a void* to enable
build on 64-bit systems where EGLSurface is a pointer.
Reviewed-By: TrustMe
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmap_x11_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_x11_p.h b/src/gui/image/qpixmap_x11_p.h index 521a612..7575838 100644 --- a/src/gui/image/qpixmap_x11_p.h +++ b/src/gui/image/qpixmap_x11_p.h @@ -94,7 +94,7 @@ public: static Qt::HANDLE createBitmapFromImage(const QImage &image); - Qt::HANDLE gl_surface; + void* gl_surface; #ifndef QT_NO_XRENDER void convertToARGB32(bool preserveContents = true); #endif |