diff -r b72c6db6890b -r 5dc02b23752f src/opengl/qglpixelbuffer_p.h
--- a/src/opengl/qglpixelbuffer_p.h	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/opengl/qglpixelbuffer_p.h	Tue Jul 06 15:10:48 2010 +0300
@@ -60,7 +60,7 @@
 #include <private/qgl_p.h>
 #include <private/qglpaintdevice_p.h>
 
-#if defined(Q_WS_X11) && !defined(QT_OPENGL_ES)
+#if defined(Q_WS_X11) && defined(QT_NO_EGL)
 #include <GL/glx.h>
 
 // The below is needed to for compilation on HPUX, due to broken GLX
@@ -127,10 +127,8 @@
 
 #elif defined(Q_WS_WIN)
 DECLARE_HANDLE(HPBUFFERARB);
-#elif defined(QT_OPENGL_ES_2)
-#include <EGL/egl.h>
-#elif defined(QT_OPENGL_ES)
-#include <GLES/egl.h>
+#elif !defined(QT_NO_EGL)
+#include <QtGui/private/qegl_p.h>
 #endif
 QT_END_INCLUDE_NAMESPACE
 
@@ -174,7 +172,7 @@
     QPointer<QGLWidget> req_shareWidget;
     QSize req_size;
 
-#if defined(Q_WS_X11) && !defined(QT_OPENGL_ES)
+#if defined(Q_WS_X11) && defined(QT_NO_EGL)
     GLXPbuffer pbuf;
     GLXContext ctx;
 #elif defined(Q_WS_WIN)
@@ -195,7 +193,7 @@
     AGLContext share_ctx;
 #  endif
 #endif
-#if defined(QT_OPENGL_ES)
+#ifndef QT_NO_EGL
     EGLSurface pbuf;
     QEglContext *ctx;
     int textureFormat;