diff -r 93b982ccede2 -r 5daf16870df6 src/gui/egl/qeglproperties_p.h
--- a/src/gui/egl/qeglproperties_p.h	Mon Jun 21 22:38:13 2010 +0100
+++ b/src/gui/egl/qeglproperties_p.h	Thu Jul 22 16:41:55 2010 +0100
@@ -56,55 +56,10 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QtGui/qimage.h>
 
-QT_BEGIN_INCLUDE_NAMESPACE
-
-#if defined(QT_OPENGL_ES_2)
-#   include <GLES2/gl2.h>
-#endif
-
-#if defined(QT_GLES_EGL)
-#   include <GLES/egl.h>
-#else
-#   include <EGL/egl.h>
-#endif
-
-
-#if defined(Q_WS_X11)
-// If <EGL/egl.h> included <X11/Xlib.h>, then the global namespace
-// may have been polluted with X #define's.  The following makes sure
-// the X11 headers were included properly and then cleans things up.
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#undef Bool
-#undef Status
-#undef None
-#undef KeyPress
-#undef KeyRelease
-#undef FocusIn
-#undef FocusOut
-#undef Type
-#undef FontChange
-#undef CursorShape
-#endif
-
-QT_END_INCLUDE_NAMESPACE
+#include <QtGui/private/qegl_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace QEgl {
-    enum API
-    {
-        OpenGL,
-        OpenVG
-    };
-
-    enum PixelFormatMatch
-    {
-        ExactPixelFormat,
-        BestPixelFormat
-    };
-};
-
 class QX11Info;
 class QPaintDevice;
 
@@ -127,16 +82,14 @@
 #ifdef Q_WS_X11
     void setVisualFormat(const QX11Info *xinfo);
 #endif
+    void setDeviceType(int devType);
+    void setPaintDeviceFormat(QPaintDevice *dev);
     void setRenderableType(QEgl::API api);
 
-    void setPaintDeviceFormat(QPaintDevice *dev);
-
     bool reduceConfiguration();
 
     QString toString() const;
 
-    static void dumpAllConfigs();
-
 private:
     QVarLengthArray<int> props;
 };