diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 01:20:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 01:20:14 (GMT) |
| commit | da6e8e44ea17da669a173c5cca38ccc77e53dd51 (patch) | |
| tree | c3d248c3d0beada8319b1091ef0938e4dc4f2b26 /src/opengl/qglpaintdevice.cpp | |
| parent | d5d5cd63e68ce63eb7a131df4dc8cfa274f93fc2 (diff) | |
| parent | ad47f9cee2cd47ef566f86ca20f54e3f6da54070 (diff) | |
| download | Qt-da6e8e44ea17da669a173c5cca38ccc77e53dd51.zip Qt-da6e8e44ea17da669a173c5cca38ccc77e53dd51.tar.gz Qt-da6e8e44ea17da669a173c5cca38ccc77e53dd51.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Remove obsolete OpenGL/ES CommonLite (fixed-point) support
Diffstat (limited to 'src/opengl/qglpaintdevice.cpp')
| -rw-r--r-- | src/opengl/qglpaintdevice.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/opengl/qglpaintdevice.cpp b/src/opengl/qglpaintdevice.cpp index 7697570..a0b1a79 100644 --- a/src/opengl/qglpaintdevice.cpp +++ b/src/opengl/qglpaintdevice.cpp @@ -48,14 +48,10 @@ #include <private/qpixmapdata_x11gl_p.h> #endif -#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) +#if !defined(QT_OPENGL_ES_1) #include <private/qpixmapdata_gl_p.h> #endif -#if defined(QT_OPENGL_ES_1_CL) -#include "qgl_cl_p.h" -#endif - QT_BEGIN_NAMESPACE QGLPaintDevice::QGLPaintDevice() @@ -198,7 +194,7 @@ QGLPaintDevice* QGLPaintDevice::getDevice(QPaintDevice* pd) glpd = &(static_cast<QGLFramebufferObject*>(pd)->d_func()->glDevice); break; case QInternal::Pixmap: { -#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) +#if !defined(QT_OPENGL_ES_1) QPixmapData* pmd = static_cast<QPixmap*>(pd)->pixmapData(); if (pmd->classId() == QPixmapData::OpenGLClass) glpd = static_cast<QGLPixmapData*>(pmd)->glDevice(); |