Kill QVideoFrame::PixmapHandle

This didn't make sense since Qt 5.0, as a pixmap is the same as an image
in Qt 5/6. It was also completely unused.

Change-Id: I97d548ca288c9aebb580f0fbaf9fbbba488e197a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

4 files changed, 1 insertions, 7 deletions

diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp
index bb33ad63f..bfb97a8fd 100644
--- a/src/multimedia/video/qabstractvideobuffer.cpp
+++ b/src/multimedia/video/qabstractvideobuffer.cpp
@@ -81,7 +81,6 @@ QT_BEGIN_NAMESPACE
     \value NoHandle The buffer has no handle, its data can only be accessed by mapping the buffer.
     \value GLTextureHandle The handle of the buffer is an OpenGL texture ID.
     \value MTLTextureHandle The handle of the buffer is an Metal texture ID.
-    \value QPixmapHandle The handle of the buffer is a QPixmap.
 
     \sa handleType()
 */
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 3545c1cc3..2f72a4e11 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -1206,8 +1206,6 @@ QDebug operator<<(QDebug dbg, QVideoFrame::HandleType type)
         return dbg << "GLTextureHandle";
     case QVideoFrame::MTLTextureHandle:
         return dbg << "MTLTextureHandle";
-    case QVideoFrame::QPixmapHandle:
-        return dbg << "QPixmapHandle";
     }
 }
 
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h
index 185291e82..6de614bd4 100644
--- a/src/multimedia/video/qvideoframe.h
+++ b/src/multimedia/video/qvideoframe.h
@@ -108,7 +108,6 @@ public:
         NoHandle,
         GLTextureHandle,
         MTLTextureHandle,
-        QPixmapHandle
     };
 
     enum MapMode
diff --git a/src/multimedia/video/qvideosink.cpp b/src/multimedia/video/qvideosink.cpp
index 405c0b4a9..8b6b088d2 100644
--- a/src/multimedia/video/qvideosink.cpp
+++ b/src/multimedia/video/qvideosink.cpp
@@ -277,9 +277,7 @@ void QVideoSink::paint(QPainter *painter, const QVideoFrame &f)
         source = s;
     }
 
-    if (frame.handleType() == QVideoFrame::QPixmapHandle) {
-        painter->drawPixmap(targetRect, frame.handle().value<QPixmap>(), source);
-    } else if (frame.map(QVideoFrame::ReadOnly)) {
+    if (frame.map(QVideoFrame::ReadOnly)) {
         QImage image = frame.image();
 
         auto oldOpacity = painter->opacity();