diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-21 13:49:42 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-21 13:49:42 (GMT) |
| commit | fc7f7d9193f0b9e4bfefa63d739a24005c0140af (patch) | |
| tree | fe2535ff138e0b116f9a39f101f4fdbb7f23732e /src/plugins | |
| parent | 63394650e71f23a036edbc0df29a1b6b19366269 (diff) | |
| parent | f1f986dfe40f82fca1a8a27f5f02e1a9f7818fd0 (diff) | |
| download | Qt-fc7f7d9193f0b9e4bfefa63d739a24005c0140af.zip Qt-fc7f7d9193f0b9e4bfefa63d739a24005c0140af.tar.gz Qt-fc7f7d9193f0b9e4bfefa63d739a24005c0140af.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/plugins')
| -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 */ |