Make it compile with no-opengl
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>
Tue, 9 Dec 2014 14:34:10 +0000 (15:34 +0100)
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>
Thu, 11 Dec 2014 15:22:34 +0000 (16:22 +0100)
Change-Id: I71358bb1268e5b28b66b1817a3ec0cd98459cfd2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
src/multimediawidgets/qpaintervideosurface.cpp

index 3a880de..2ab5dcb 100644 (file)
@@ -96,7 +96,9 @@ QVideoSurfaceGenericPainter::QVideoSurfaceGenericPainter()
         << QVideoFrame::Format_ARGB32
         << QVideoFrame::Format_RGB565;
     // The raster formats should be a subset of the GL formats.
+#ifndef QT_NO_OPENGL
     if (QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGLES)
+#endif
         m_imagePixelFormats << QVideoFrame::Format_RGB24;
 }
 
@@ -137,7 +139,9 @@ QAbstractVideoSurface::Error QVideoSurfaceGenericPainter::start(const QVideoSurf
     const QAbstractVideoBuffer::HandleType t = format.handleType();
     if (t == QAbstractVideoBuffer::NoHandle) {
         bool ok = m_imageFormat != QImage::Format_Invalid && !m_imageSize.isEmpty();
+#ifndef QT_NO_OPENGL
         if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES)
+#endif
             ok &= format.pixelFormat() != QVideoFrame::Format_RGB24;
         if (ok)
             return QAbstractVideoSurface::NoError;