diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-16 00:56:47 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-16 00:56:47 (GMT) |
| commit | 2d264a80f9fc759e979dfe2583425cb419688a70 (patch) | |
| tree | 7fb448c59ee00e466d0fb58fb5ca4ab78d26c2f8 /src/multimedia/base | |
| parent | e91af4016e8482a9b1437b8edc71347b5cfd2a83 (diff) | |
| download | Qt-2d264a80f9fc759e979dfe2583425cb419688a70.zip Qt-2d264a80f9fc759e979dfe2583425cb419688a70.tar.gz Qt-2d264a80f9fc759e979dfe2583425cb419688a70.tar.bz2 | |
Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL.
Diffstat (limited to 'src/multimedia/base')
| -rw-r--r-- | src/multimedia/base/qgraphicsvideoitem.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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 } } |