diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2011-12-05 14:52:11 +0000 |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2011-12-05 14:52:56 +0000 |
| commit | 5c1aaddf9f5d8f335ca1f18bce0d534d016da5b2 (patch) | |
| tree | 7bc8552ae2b1a6914de99988c17ab5d16c1e30cd /plugins | |
| parent | bb02a3149629d54d37417623bd5ca0a833fd332f (diff) | |
Fix build break caused by f7c1dda0
Allow code to build when QT_NO_OPENGL is defined.
Task-number: QTMOBILITY-1818
Task-number: MOBILITY-3084
Reviewed-by: TrustMe
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/multimedia/symbian/videooutput/s60videobuffer.cpp | 6 | ||||
| -rw-r--r-- | plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/plugins/multimedia/symbian/videooutput/s60videobuffer.cpp b/plugins/multimedia/symbian/videooutput/s60videobuffer.cpp index 3a4fbd253d..45611ec793 100644 --- a/plugins/multimedia/symbian/videooutput/s60videobuffer.cpp +++ b/plugins/multimedia/symbian/videooutput/s60videobuffer.cpp @@ -53,8 +53,10 @@ // TODO: get rid of these magic numbers const QAbstractVideoBuffer::HandleType EGLImageTextureHandle = QAbstractVideoBuffer::HandleType(QAbstractVideoBuffer::UserHandle + 128); +#ifndef QT_NO_OPENVG const QAbstractVideoBuffer::HandleType VGImageTextureHandle = QAbstractVideoBuffer::HandleType(QAbstractVideoBuffer::UserHandle + 129); +#endif // !QT_NO_OPENVG // Dummy pointer returned by map() - see comments below static uchar* const DummyMapReturnValue = reinterpret_cast<uchar *>(1); @@ -206,7 +208,7 @@ QVariant S60GlTextureVideoBuffer::handle() const // S60VGImageVideoBuffer //----------------------------------------------------------------------------- -#ifndef QT_NO_OPENGL +#ifndef QT_NO_OPENVG S60VgImageVideoBuffer::S60VgImageVideoBuffer(S60VideoEglRendererControl *control, S60EglEndpoint *endpoint, @@ -247,5 +249,5 @@ QVariant S60VgImageVideoBuffer::handle() const return static_cast<quint32>(m_vgImage); } -#endif // !QT_NO_OPENGL +#endif // !QT_NO_OPENVG diff --git a/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.cpp b/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.cpp index a7cea15cde..29f3ef39c2 100644 --- a/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.cpp +++ b/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.cpp @@ -154,12 +154,16 @@ void S60VideoEglRendererControl::imageAvailable() m_buffer = new S60EglImageVideoBuffer(this, m_eglEndpoint); } else { switch (api) { +#ifndef QT_NO_OPENGL case EGL_OPENGL_ES_API: m_buffer = new S60GlTextureVideoBuffer(this, m_eglEndpoint, m_eglExtensions); break; +#endif +#ifndef QT_NO_OPENVG case EGL_OPENVG_API: m_buffer = new S60VgImageVideoBuffer(this, m_eglEndpoint, m_eglExtensions); break; +#endif } } Q_ASSERT(m_buffer); |