Merge 5.10 into 5.10.0

Change-Id: Id50796542954ded82fb265b4737d737aff033633

1 files changed, 4 insertions, 0 deletions

diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
index 214e5ec7e..6e93e150d 100644
--- a/src/multimediawidgets/qpaintervideosurface.cpp
+++ b/src/multimediawidgets/qpaintervideosurface.cpp
@@ -191,6 +191,10 @@ QAbstractVideoSurface::Error QVideoSurfaceGenericPainter::paint(
                 m_imageSize.height(),
                 m_frame.bytesPerLine(),
                 m_imageFormat);
+        // Do not render into ARGB32 images using QPainter.
+        // Using QImage::Format_ARGB32_Premultiplied is significantly faster.
+        if (m_imageFormat == QImage::Format_ARGB32)
+            image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
 
         const QTransform oldTransform = painter->transform();
         QTransform transform = oldTransform;