diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-03 01:06:02 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-03 01:06:02 (GMT) |
| commit | 4c0b6e0d0a5303861098f653e1c8e8823480ac82 (patch) | |
| tree | 2529081b4f2d4e20f69bbb77435712db31765bb1 /src/gui/egl/qeglproperties_p.h | |
| parent | c131c4d922bd381b44164673085fb83547375fd0 (diff) | |
| parent | c9e07d69ec084a75fc083baecd46d0b8b422d1c4 (diff) | |
| download | Qt-4c0b6e0d0a5303861098f653e1c8e8823480ac82.zip Qt-4c0b6e0d0a5303861098f653e1c8e8823480ac82.tar.gz Qt-4c0b6e0d0a5303861098f653e1c8e8823480ac82.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/egl/qeglproperties_p.h')
| -rw-r--r-- | src/gui/egl/qeglproperties_p.h | 46 |
1 files changed, 3 insertions, 43 deletions
diff --git a/src/gui/egl/qeglproperties_p.h b/src/gui/egl/qeglproperties_p.h index feed1d2..eebcf72 100644 --- a/src/gui/egl/qeglproperties_p.h +++ b/src/gui/egl/qeglproperties_p.h @@ -56,50 +56,10 @@ #include <QtCore/qvarlengtharray.h> #include <QtGui/qimage.h> -QT_BEGIN_INCLUDE_NAMESPACE - -#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; @@ -122,9 +82,9 @@ public: #ifdef Q_WS_X11 void setVisualFormat(const QX11Info *xinfo); #endif - void setRenderableType(QEgl::API api); - + void setDeviceType(int devType); void setPaintDeviceFormat(QPaintDevice *dev); + void setRenderableType(QEgl::API api); bool reduceConfiguration(); |