diff options
| author | Nicholas Young <nicholas.young@nokia.com> | 2010-02-16 04:09:03 (GMT) |
|---|---|---|
| committer | Nicholas Young <nicholas.young@nokia.com> | 2010-02-16 04:09:03 (GMT) |
| commit | be2c02716595545a87330cdbe38a4ec5cd3522e3 (patch) | |
| tree | b32172c955a2dfd6ee74f48ab45f6a185e90f76d /src/multimedia/base | |
| parent | 4374a796e1986b0b7f50256aefce4e9859fc4703 (diff) | |
| parent | 78967c9f7cfba6142a5f987a1fe81692b479a6d2 (diff) | |
| download | Qt-be2c02716595545a87330cdbe38a4ec5cd3522e3.zip Qt-be2c02716595545a87330cdbe38a4ec5cd3522e3.tar.gz Qt-be2c02716595545a87330cdbe38a4ec5cd3522e3.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team
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 } } |