From 1c1a6e34cc1956973ad09b9e057aff6573e13f8d Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Wed, 9 Sep 2009 15:11:32 +0200
Subject: Fix OpenGL ES 1.x after QGLPaintDevice refactor

QGLPixmapData needs to be #define'd out for OpenGL ES 1.x

Reviewed-by: Trustme
---
 src/opengl/qglpaintdevice.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/opengl/qglpaintdevice.cpp b/src/opengl/qglpaintdevice.cpp
index c0f1813..7dac55d 100644
--- a/src/opengl/qglpaintdevice.cpp
+++ b/src/opengl/qglpaintdevice.cpp
@@ -44,7 +44,10 @@
 #include <private/qglpixelbuffer_p.h>
 #include <private/qglframebufferobject_p.h>
 #include <private/qwindowsurface_gl_p.h>
+
+#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
 #include <private/qpixmapdata_gl_p.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -172,8 +175,12 @@ QGLPaintDevice* QGLPaintDevice::getDevice(QPaintDevice* pd)
             break;
         case QInternal::Pixmap: {
             QPixmapData* pmd = static_cast<QPixmap*>(pd)->pixmapData();
+#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
             Q_ASSERT(pmd->classId() == QPixmapData::OpenGLClass);
             glpd = static_cast<QGLPixmapData*>(pmd)->glDevice();
+#else
+            qWarning("Pixmap render targets not supported on OpenGL ES 1.x");
+#endif
             break;
         }
         default:
-- 
cgit v0.12