diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-31 09:55:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-31 09:55:44 (GMT) |
| commit | b764d3e6cb114988394e7500236ba087a3385a50 (patch) | |
| tree | bee07ca38829fcc684e2e8db02ed398acb9d7bcf /src/opengl | |
| parent | 97902c7f81228fa669acc6e075681dc05b404b1a (diff) | |
| parent | 9507cbffb31b5ee4bfd9b4d2584406a2346fb668 (diff) | |
| download | Qt-b764d3e6cb114988394e7500236ba087a3385a50.zip Qt-b764d3e6cb114988394e7500236ba087a3385a50.tar.gz Qt-b764d3e6cb114988394e7500236ba087a3385a50.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed not switching to MeeGo graphicssystem.
Fixed rounding of coordinates pre-transformation in CG paintengine.
Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qglpaintdevice.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index ded7aa8..b755153 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 @@ -86,7 +87,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" diff --git a/src/opengl/qglpaintdevice.cpp b/src/opengl/qglpaintdevice.cpp index ae61ca1..0e879df 100644 --- a/src/opengl/qglpaintdevice.cpp +++ b/src/opengl/qglpaintdevice.cpp @@ -43,13 +43,13 @@ #include <private/qgl_p.h> #include <private/qglpixelbuffer_p.h> #include <private/qglframebufferobject_p.h> -#include <private/qwindowsurface_gl_p.h> #ifdef Q_WS_X11 #include <private/qpixmapdata_x11gl_p.h> #endif #if !defined(QT_OPENGL_ES_1) #include <private/qpixmapdata_gl_p.h> +#include <private/qwindowsurface_gl_p.h> #endif QT_BEGIN_NAMESPACE |