diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-01-29 00:48:15 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-04 01:06:08 (GMT) |
commit | ad47f9cee2cd47ef566f86ca20f54e3f6da54070 (patch) | |
tree | 2c77b9ee200da679ffabea192395ec8fc4509b43 /src/opengl/qglpaintdevice.cpp | |
parent | 35988b6d5d14388004a4b51df1355d3d3a97d145 (diff) | |
download | Qt-ad47f9cee2cd47ef566f86ca20f54e3f6da54070.zip Qt-ad47f9cee2cd47ef566f86ca20f54e3f6da54070.tar.gz Qt-ad47f9cee2cd47ef566f86ca20f54e3f6da54070.tar.bz2 |
Remove obsolete OpenGL/ES CommonLite (fixed-point) support
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
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(); |