summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglpaintdevice.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-31 09:55:44 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-31 09:55:44 (GMT)
commitb764d3e6cb114988394e7500236ba087a3385a50 (patch)
treebee07ca38829fcc684e2e8db02ed398acb9d7bcf /src/opengl/qglpaintdevice.cpp
parent97902c7f81228fa669acc6e075681dc05b404b1a (diff)
parent9507cbffb31b5ee4bfd9b4d2584406a2346fb668 (diff)
downloadQt-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/qglpaintdevice.cpp')
-rw-r--r--src/opengl/qglpaintdevice.cpp2
1 files changed, 1 insertions, 1 deletions
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