diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-02-16 08:38:23 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-03-02 08:24:23 (GMT) |
| commit | 56d32b57814cb35409bc9b0076ec753de488ae7f (patch) | |
| tree | 34c96cff78ea5cbfb128a72c2b9a86bf2e63a86b /src/opengl | |
| parent | b2b9dc03fc01a8387e74591642fa15b272845e2b (diff) | |
| download | Qt-56d32b57814cb35409bc9b0076ec753de488ae7f.zip Qt-56d32b57814cb35409bc9b0076ec753de488ae7f.tar.gz Qt-56d32b57814cb35409bc9b0076ec753de488ae7f.tar.bz2 | |
Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.h
This puts the QEgl namespace in a single file which can be used by
both qeglcontext and qeglproperties. Files which need QEglContext
should now include qeglcontext_p.h.
Reviewed-By: Aleksandar Sasha Babic
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_egl_p.h | 3 | ||||
| -rw-r--r-- | src/opengl/qgl_wince.cpp | 3 | ||||
| -rw-r--r-- | src/opengl/qpixmapdata_x11gl_egl.cpp | 1 | ||||
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/src/opengl/qgl_egl_p.h b/src/opengl/qgl_egl_p.h index c503724..518b500 100644 --- a/src/opengl/qgl_egl_p.h +++ b/src/opengl/qgl_egl_p.h @@ -53,7 +53,8 @@ // We mean it. // -#include <QtGui/private/qegl_p.h> +#include <QtGui/private/qeglcontext_p.h> +#include <QtGui/private/qeglproperties_p.h> QT_BEGIN_NAMESPACE diff --git a/src/opengl/qgl_wince.cpp b/src/opengl/qgl_wince.cpp index f81115c..2b71201 100644 --- a/src/opengl/qgl_wince.cpp +++ b/src/opengl/qgl_wince.cpp @@ -54,7 +54,8 @@ #include <windows.h> -#include <private/qegl_p.h> +#include <private/qeglproperties_p.h> +#include <private/qeglcontext_p.h> #include <private/qgl_egl_p.h> #include <private/qgl_cl_p.h> diff --git a/src/opengl/qpixmapdata_x11gl_egl.cpp b/src/opengl/qpixmapdata_x11gl_egl.cpp index 6a1d030..4f1543c 100644 --- a/src/opengl/qpixmapdata_x11gl_egl.cpp +++ b/src/opengl/qpixmapdata_x11gl_egl.cpp @@ -44,6 +44,7 @@ #include <private/qgl_p.h> #include <private/qegl_p.h> #include <private/qeglproperties_p.h> +#include <private/qeglcontext_p.h> #if !defined(QT_OPENGL_ES_1) #include <private/qpaintengineex_opengl2_p.h> diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 4ac4a3a..0334cbc 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -83,7 +83,7 @@ #endif #ifdef QT_OPENGL_ES -#include <private/qegl_p.h> +#include <private/qeglcontext_p.h> #endif QT_BEGIN_NAMESPACE |