From f1f986dfe40f82fca1a8a27f5f02e1a9f7818fd0 Mon Sep 17 00:00:00 2001
From: Benjamin Poulain <benjamin.poulain@nokia.com>
Date: Tue, 21 Sep 2010 12:47:00 +0200
Subject: Qt headers must be included before X11 headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

X11 symbols are conflicting with some of the Qt ones. Qt headers needs
to be included before the X11 ones in order to compile on Maemo.

Reviewed-by: Samuel Rødal
---
 src/plugins/graphicssystems/meego/qmeegoextensions.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.h b/src/plugins/graphicssystems/meego/qmeegoextensions.h
index f1a74f5..ee20bd8 100644
--- a/src/plugins/graphicssystems/meego/qmeegoextensions.h
+++ b/src/plugins/graphicssystems/meego/qmeegoextensions.h
@@ -42,12 +42,12 @@
 #ifndef MEXTENSIONS_H
 #define MEXTENSIONS_H
 
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
 #include <private/qgl_p.h>
 #include <private/qeglcontext_p.h>
 #include <private/qpixmapdata_gl_p.h>
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 
 /* Extensions decls */
 
-- 
cgit v0.12