diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-05 12:05:24 +0300 |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-05 12:05:24 +0300 |
| commit | c20dbae2860d1ec681be50f161792c6aede08b1b (patch) | |
| tree | ad0082d3fb710ffd20d4c1745f312c1a702b5a16 /src/opengl/qgl.cpp | |
| parent | 9c365ff16abec339c3930444dc1722a419f07dad (diff) | |
| parent | c3e903409b96fede96cb4a7b95ba308663c88879 (diff) | |
| download | qt4-tools-c20dbae2860d1ec681be50f161792c6aede08b1b.tar.gz | |
Merge remote-tracking branch 'qt-master/master'
Conflicts:
src/s60installs/bwins/QtOpenVGu.def
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 4698a5c9b8..684116c8b0 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -69,6 +69,7 @@ #if !defined(QT_OPENGL_ES_1) #include "gl2paintengineex/qpaintengineex_opengl2_p.h" +#include <private/qwindowsurface_gl_p.h> #endif #ifndef QT_OPENGL_ES_2 @@ -90,7 +91,6 @@ #include <private/qpixmapdata_p.h> #include <private/qpixmapdata_gl_p.h> #include <private/qglpixelbuffer_p.h> -#include <private/qwindowsurface_gl_p.h> #include <private/qimagepixmapcleanuphooks_p.h> #include "qcolormap.h" #include "qfile.h" |