6 files changed, 14 insertions, 21 deletions
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
index c0e1c3925..672a103de 100644
--- a/src/multimediawidgets/qpaintervideosurface.cpp
+++ b/src/multimediawidgets/qpaintervideosurface.cpp
@@ -70,8 +70,7 @@ public:
     QList<QVideoFrame::PixelFormat> supportedPixelFormats(
             QAbstractVideoBuffer::HandleType handleType) const;
 
-    bool isFormatSupported(
-            const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const;
+    bool isFormatSupported(const QVideoSurfaceFormat &format) const;
 
     QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format);
     void stop();
@@ -117,8 +116,7 @@ QList<QVideoFrame::PixelFormat> QVideoSurfaceGenericPainter::supportedPixelForma
     return QList<QVideoFrame::PixelFormat>();
 }
 
-bool QVideoSurfaceGenericPainter::isFormatSupported(
-        const QVideoSurfaceFormat &format, QVideoSurfaceFormat *) const
+bool QVideoSurfaceGenericPainter::isFormatSupported(const QVideoSurfaceFormat &format) const
 {
     switch (format.handleType()) {
     case QAbstractVideoBuffer::QPixmapHandle:
@@ -246,8 +244,7 @@ public:
     QList<QVideoFrame::PixelFormat> supportedPixelFormats(
             QAbstractVideoBuffer::HandleType handleType) const;
 
-    bool isFormatSupported(
-            const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const;
+    bool isFormatSupported(const QVideoSurfaceFormat &format) const;
 
     QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame);
 
@@ -327,8 +324,7 @@ QList<QVideoFrame::PixelFormat> QVideoSurfaceGLPainter::supportedPixelFormats(
     return QList<QVideoFrame::PixelFormat>();
 }
 
-bool QVideoSurfaceGLPainter::isFormatSupported(
-        const QVideoSurfaceFormat &format, QVideoSurfaceFormat *) const
+bool QVideoSurfaceGLPainter::isFormatSupported(const QVideoSurfaceFormat &format) const
 {
     if (format.frameSize().isEmpty()) {
         return false;
@@ -1349,13 +1345,12 @@ QList<QVideoFrame::PixelFormat> QPainterVideoSurface::supportedPixelFormats(
 
 /*!
 */
-bool QPainterVideoSurface::isFormatSupported(
-        const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const
+bool QPainterVideoSurface::isFormatSupported(const QVideoSurfaceFormat &format) const
 {
     if (!m_painter)
         const_cast<QPainterVideoSurface *>(this)->createPainter();
 
-    return m_painter->isFormatSupported(format, similar);
+    return m_painter->isFormatSupported(format);
 }
 
 /*!
diff --git a/src/multimediawidgets/qpaintervideosurface_mac.mm b/src/multimediawidgets/qpaintervideosurface_mac.mm
index a3c55ca4b..a741d9eea 100644
--- a/src/multimediawidgets/qpaintervideosurface_mac.mm
+++ b/src/multimediawidgets/qpaintervideosurface_mac.mm
@@ -97,8 +97,7 @@ QList<QVideoFrame::PixelFormat> QVideoSurfaceCoreGraphicsPainter::supportedPixel
         : QList<QVideoFrame::PixelFormat>();
 }
 
-bool QVideoSurfaceCoreGraphicsPainter::isFormatSupported(
-        const QVideoSurfaceFormat &format, QVideoSurfaceFormat *) const
+bool QVideoSurfaceCoreGraphicsPainter::isFormatSupported(const QVideoSurfaceFormat &format) const
 {
     return m_supportedHandles.contains(format.handleType())
             && m_imagePixelFormats.contains(format.pixelFormat())
diff --git a/src/multimediawidgets/qpaintervideosurface_mac_p.h b/src/multimediawidgets/qpaintervideosurface_mac_p.h
index 6f78c8f2a..6d93381ab 100644
--- a/src/multimediawidgets/qpaintervideosurface_mac_p.h
+++ b/src/multimediawidgets/qpaintervideosurface_mac_p.h
@@ -73,8 +73,7 @@ public:
     QList<QVideoFrame::PixelFormat> supportedPixelFormats(
             QAbstractVideoBuffer::HandleType handleType) const;
 
-    bool isFormatSupported(
-            const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const;
+    bool isFormatSupported(const QVideoSurfaceFormat &format) const;
 
     QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format);
     void stop();
diff --git a/src/multimediawidgets/qpaintervideosurface_p.h b/src/multimediawidgets/qpaintervideosurface_p.h
index 57d4bb69a..341f940e3 100644
--- a/src/multimediawidgets/qpaintervideosurface_p.h
+++ b/src/multimediawidgets/qpaintervideosurface_p.h
@@ -82,8 +82,7 @@ public:
     virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(
             QAbstractVideoBuffer::HandleType handleType) const = 0;
 
-    virtual bool isFormatSupported(
-            const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const = 0;
+    virtual bool isFormatSupported(const QVideoSurfaceFormat &format) const = 0;
 
     virtual QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) = 0;
     virtual void stop() = 0;
@@ -108,8 +107,7 @@ public:
     QList<QVideoFrame::PixelFormat> supportedPixelFormats(
             QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const;
 
-    bool isFormatSupported(
-            const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar = 0) const;
+    bool isFormatSupported(const QVideoSurfaceFormat &format) const;
 
     bool start(const QVideoSurfaceFormat &format);
     void stop();
diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.cpp b/src/plugins/pulseaudio/qaudioinput_pulse.cpp
index 98925be1d..79d7b7e24 100644
--- a/src/plugins/pulseaudio/qaudioinput_pulse.cpp
+++ b/src/plugins/pulseaudio/qaudioinput_pulse.cpp
@@ -471,7 +471,7 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
         if (m_pullMode) {
             actualLength = m_audioSource->write(static_cast<const char *>(audioBuffer), readLength);
 
-            if (actualLength < readLength) {
+            if (actualLength < qint64(readLength)) {
                 pa_threaded_mainloop_unlock(pulseEngine->mainloop());
 
                 m_errorState = QAudio::UnderrunError;
@@ -489,7 +489,7 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
         qDebug() << "QPulseAudioInput::read -- wrote " << actualLength << " to client";
 #endif
 
-        if (actualLength < readLength) {
+        if (actualLength < qint64(readLength)) {
 #ifdef DEBUG_PULSE
             qDebug() << "QPulseAudioInput::read -- appending " << readLength - actualLength << " bytes of data to temp buffer";
 #endif
diff --git a/src/plugins/qt7/qt7movierenderer.mm b/src/plugins/qt7/qt7movierenderer.mm
index 95f45f0f3..afddd4dd4 100644
--- a/src/plugins/qt7/qt7movierenderer.mm
+++ b/src/plugins/qt7/qt7movierenderer.mm
@@ -401,6 +401,8 @@ void QT7MovieRenderer::setMovie(void *movie)
 
         setupVideoOutput();
     }
+#else
+    Q_UNUSED(movie);
 #endif
 }