diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 15:29:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 15:29:37 (GMT) |
| commit | d241b5a663b9b9ad457ae3b2510b36b72a7bc316 (patch) | |
| tree | 6cf7a29fa08dc8c42b83a4b90ca3d2cb464c05e8 /src/opengl | |
| parent | 86354a3896b92b110e5d28cbf894c23ed837f11e (diff) | |
| parent | b4519f022e8b715991836894fe97b6338ef7ee2b (diff) | |
| download | Qt-d241b5a663b9b9ad457ae3b2510b36b72a7bc316.zip Qt-d241b5a663b9b9ad457ae3b2510b36b72a7bc316.tar.gz Qt-d241b5a663b9b9ad457ae3b2510b36b72a7bc316.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:
fix to mainwindow demo
Fix build on Maemo X11
Fix crash on Win with 16bit screendepth when copy/pasting images
Enable cleanup hooks when creating an EGL surface for a pixmap
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_x11egl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 5ffecc5..fdcc412 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -42,7 +42,6 @@ #include "qgl.h" #include <private/qt_x11_p.h> #include <private/qpixmap_x11_p.h> -#include <private/qimagepixmapcleanuphooks_p.h> #include <private/qgl_p.h> #include <private/qpaintengine_opengl_p.h> #include "qgl_egl_p.h" |