equal
deleted
inserted
replaced
56 #include <QtCore/qvarlengtharray.h> |
56 #include <QtCore/qvarlengtharray.h> |
57 #include <QtGui/qimage.h> |
57 #include <QtGui/qimage.h> |
58 |
58 |
59 QT_BEGIN_INCLUDE_NAMESPACE |
59 QT_BEGIN_INCLUDE_NAMESPACE |
60 |
60 |
|
61 #if defined(QT_OPENGL_ES_2) |
|
62 # include <GLES2/gl2.h> |
|
63 #endif |
|
64 |
61 #if defined(QT_GLES_EGL) |
65 #if defined(QT_GLES_EGL) |
62 #include <GLES/egl.h> |
66 # include <GLES/egl.h> |
63 #else |
67 #else |
64 #include <EGL/egl.h> |
68 # include <EGL/egl.h> |
65 #endif |
69 #endif |
|
70 |
66 |
71 |
67 #if defined(Q_WS_X11) |
72 #if defined(Q_WS_X11) |
68 // If <EGL/egl.h> included <X11/Xlib.h>, then the global namespace |
73 // If <EGL/egl.h> included <X11/Xlib.h>, then the global namespace |
69 // may have been polluted with X #define's. The following makes sure |
74 // may have been polluted with X #define's. The following makes sure |
70 // the X11 headers were included properly and then cleans things up. |
75 // the X11 headers were included properly and then cleans things up. |