From 2d264a80f9fc759e979dfe2583425cb419688a70 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Tue, 16 Feb 2010 10:56:47 +1000
Subject: Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include
 QtOpenGL.

---
 src/multimedia/base/qgraphicsvideoitem.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/multimedia/base/qgraphicsvideoitem.cpp b/src/multimedia/base/qgraphicsvideoitem.cpp
index 85369db..21ba8c9 100644
--- a/src/multimedia/base/qgraphicsvideoitem.cpp
+++ b/src/multimedia/base/qgraphicsvideoitem.cpp
@@ -47,7 +47,10 @@
 #include <QtMultimedia/qvideooutputcontrol.h>
 #include <QtMultimedia/qvideorenderercontrol.h>
 #include <QtMultimedia/qvideosurfaceformat.h>
+
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
 #include <QtOpenGL/qgl.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -384,6 +387,7 @@ void QGraphicsVideoItem::paint(
     if (d->surface && d->surface->isActive()) {
         d->surface->paint(painter, d->boundingRect, d->sourceRect);
         d->surface->setReady(true);
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
     } else if (d->updatePaintDevice && (painter->paintEngine()->type() == QPaintEngine::OpenGL
             || painter->paintEngine()->type() == QPaintEngine::OpenGL2)) {
         d->updatePaintDevice = false;
@@ -394,6 +398,7 @@ void QGraphicsVideoItem::paint(
         } else {
             d->surface->setShaderType(QPainterVideoSurface::FragmentProgramShader);
         }
+#endif
     }
 }
 
-- 
cgit v0.12