From cea87b08520888feff2f10d1bbf71bc8c2f1d780 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Tue, 9 Jun 2009 13:20:51 +1000
Subject: 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
---
 src/opengl/qglpixelbuffer.cpp | 9 ++++++---
 1 file 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
-- 
cgit v0.12