diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 11:18:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 11:18:09 (GMT) |
| commit | 504fb8a30ffef1f90a4cd4d61ab7f73c95fd9a03 (patch) | |
| tree | ac7456cb14db561af960a579a1608d043c905c54 /src/gui/egl/qegl_x11.cpp | |
| parent | 12d63b05a942281e688d857d17c190564c77b698 (diff) | |
| parent | 66e22b5b65b09cf4824dbfbc91e8dea04e8e4214 (diff) | |
| download | Qt-504fb8a30ffef1f90a4cd4d61ab7f73c95fd9a03.zip Qt-504fb8a30ffef1f90a4cd4d61ab7f73c95fd9a03.tar.gz Qt-504fb8a30ffef1f90a4cd4d61ab7f73c95fd9a03.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:
MAke the SIMD fiunctions be used even when the QT_NO_DEBUG macro is used
Make sure 16-bit EGL configs are chosen over 32-bit configs
Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATIC
Handle EGLSurfaces better, including more error detection
Make sure pixmap hooks get installed so EGL surfaces are cleaned up
Don't show resize cursor for fixed-size windows
Diffstat (limited to 'src/gui/egl/qegl_x11.cpp')
| -rw-r--r-- | src/gui/egl/qegl_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp index 53c4711..91423c8 100644 --- a/src/gui/egl/qegl_x11.cpp +++ b/src/gui/egl/qegl_x11.cpp @@ -408,7 +408,7 @@ EGLSurface QEgl::createSurface(QPaintDevice *device, EGLConfig config, const QEg EGLSurface surf = eglCreatePixmapSurface(QEgl::display(), config, (EGLNativePixmapType) x11PixmapData->handle(), surfaceAttribs.properties()); - x11PixmapData->gl_surface = (Qt::HANDLE)surf; + x11PixmapData->gl_surface = (void*)surf; QImagePixmapCleanupHooks::enableCleanupHooks(x11PixmapData); return surf; } |