diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-06-09 03:20:51 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-06-09 03:20:51 (GMT) |
| commit | cea87b08520888feff2f10d1bbf71bc8c2f1d780 (patch) | |
| tree | 008a285f1252f10cd2dc71412ad030d7c9d806b4 | |
| parent | 6d4fe549e7a258913b19f52e29bcfb84cc8a97ad (diff) | |
| download | Qt-cea87b08520888feff2f10d1bbf71bc8c2f1d780.zip Qt-cea87b08520888feff2f10d1bbf71bc8c2f1d780.tar.gz Qt-cea87b08520888feff2f10d1bbf71bc8c2f1d780.tar.bz2 | |
Another breakage in 1bbe23c5 - move qpaintengineex_opengl2_p.h include up
Moving qpaintengineex_opengl2_p.h down caused it to come after
an include of <X11/Xlib.h>, which causes problems on some platforms.
Move it back up again.
Reviewed-by: trustme
| -rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 0af97e3..9b7a506 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -76,13 +76,16 @@ \sa {opengl/pbuffers}{Pbuffers Example} */ -#include <qglpixelbuffer.h> -#include <private/qglpixelbuffer_p.h> -#include <qimage.h> +#include <QtCore/qglobal.h> #if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) #include <private/qpaintengineex_opengl2_p.h> #endif + +#include <qglpixelbuffer.h> +#include <private/qglpixelbuffer_p.h> +#include <qimage.h> + #ifndef QT_OPENGL_ES_2 #include <private/qpaintengine_opengl_p.h> #endif |