Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
2015-02-13 13:10:48 +01:00
parent bbfccc7135 06259f1dfb
commit f9014d136f
27 changed files with 128468 additions and 29717 deletions
--- a/src/multimediawidgets/qpaintervideosurface.cpp
+++ b/src/multimediawidgets/qpaintervideosurface.cpp
@@ -141,8 +141,8 @@ QAbstractVideoSurface::Error QVideoSurfaceGenericPainter::start(const QVideoSurf
        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;
+#endif
        if (ok)
            return QAbstractVideoSurface::NoError;
    } else if (t == QAbstractVideoBuffer::QPixmapHandle) {