diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-09-21 10:47:00 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-09-22 13:40:04 (GMT) |
| commit | 7ce308d589c7dbbe295f2cf2a2975a05dd4d1812 (patch) | |
| tree | 39f8f89201eb59dc8cd0291ccc5c941d4d77369b | |
| parent | b049dbe2efd6001f0496dffdc4fd289fa10ea25a (diff) | |
| download | Qt-7ce308d589c7dbbe295f2cf2a2975a05dd4d1812.zip Qt-7ce308d589c7dbbe295f2cf2a2975a05dd4d1812.tar.gz Qt-7ce308d589c7dbbe295f2cf2a2975a05dd4d1812.tar.bz2 | |
Qt headers must be included before X11 headers
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
(cherry picked from commit f1f986dfe40f82fca1a8a27f5f02e1a9f7818fd0)
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegoextensions.h | 6 |
1 files 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 */ |