From 2b181d546970d18a48a0f36f5d1a22418b61cd4d Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 9 Dec 2014 15:34:10 +0100 Subject: Make it compile with no-opengl Change-Id: I71358bb1268e5b28b66b1817a3ec0cd98459cfd2 Reviewed-by: Friedemann Kleint Reviewed-by: Yoann Lopes --- src/multimediawidgets/qpaintervideosurface.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/multimediawidgets') diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 3a880de2f..2ab5dcbf5 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -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; -- cgit v1.2.3