Update dependencies

Fix some warnings about deprecated API and usage
pf QMutexLocker.

Change-Id: I16a1e66a57d0c638f88478ec250e92178c6a433c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

5 files changed, 47 insertions, 47 deletions

diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
index de7a3aab1..d2e097895 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
+++ b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
@@ -83,7 +83,7 @@ QAndroidMetaDataReaderControl::QAndroidMetaDataReaderControl(QObject *parent)
 
 QAndroidMetaDataReaderControl::~QAndroidMetaDataReaderControl()
 {
-    QMutexLocker l(g_metaDataReadersMtx);
+    QMutexLocker l(g_metaDataReadersMtx());
     const int idx = g_metaDataReaders->indexOf(this);
     if (idx != -1)
         g_metaDataReaders->remove(idx);
@@ -117,7 +117,7 @@ void QAndroidMetaDataReaderControl::onMediaChanged(const QMediaContent &media)
 void QAndroidMetaDataReaderControl::onUpdateMetaData()
 {
     {
-        const QMutexLocker l(g_metaDataReadersMtx);
+        const QMutexLocker l(g_metaDataReadersMtx());
         if (!g_metaDataReaders->contains(this))
             g_metaDataReaders->append(this);
     }
@@ -238,7 +238,7 @@ void QAndroidMetaDataReaderControl::extractMetadata(QAndroidMetaDataReaderContro
             metadata.insert(QMediaMetaData::Year, string.toInt());
     }
 
-    const QMutexLocker lock(g_metaDataReadersMtx);
+    const QMutexLocker lock(g_metaDataReadersMtx());
     if (!g_metaDataReaders->contains(caller))
         return;
 
diff --git a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp
index c5b670142..d861a355f 100644
--- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp
+++ b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp
@@ -52,7 +52,7 @@ Q_GLOBAL_STATIC(QMutex, g_textureMutex);
 // native method for QtSurfaceTexture.java
 static void notifyFrameAvailable(JNIEnv* , jobject, jlong id)
 {
-    const QMutexLocker lock(g_textureMutex);
+    const QMutexLocker lock(g_textureMutex());
     const int idx = g_surfaceTextures->indexOf(id);
     if (idx == -1)
         return;
@@ -84,7 +84,7 @@ AndroidSurfaceTexture::AndroidSurfaceTexture(quint32 texName)
     if (!m_surfaceTexture.isValid())
         return;
 
-    const QMutexLocker lock(g_textureMutex);
+    const QMutexLocker lock(g_textureMutex());
     g_surfaceTextures->append(jlong(this));
     QJNIObjectPrivate listener(QtSurfaceTextureListenerClassName, "(J)V", jlong(this));
     setOnFrameAvailableListener(listener);
@@ -97,7 +97,7 @@ AndroidSurfaceTexture::~AndroidSurfaceTexture()
 
     if (m_surfaceTexture.isValid()) {
         release();
-        const QMutexLocker lock(g_textureMutex);
+        const QMutexLocker lock(g_textureMutex());
         const int idx = g_surfaceTextures->indexOf(jlong(this));
         if (idx != -1)
             g_surfaceTextures->remove(idx);
diff --git a/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp b/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp
index d7587f479..65dfe84b9 100644
--- a/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp
+++ b/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp
@@ -61,7 +61,7 @@ AndroidSurfaceHolder::AndroidSurfaceHolder(QJNIObjectPrivate object)
         return;
 
     {
-        QMutexLocker locker(shLock);
+        QMutexLocker locker(shLock());
         surfaceHolders->append(this);
     }
 
@@ -73,7 +73,7 @@ AndroidSurfaceHolder::AndroidSurfaceHolder(QJNIObjectPrivate object)
 
 AndroidSurfaceHolder::~AndroidSurfaceHolder()
 {
-    QMutexLocker locker(shLock);
+    QMutexLocker locker(shLock());
     const int i = surfaceHolders->indexOf(this);
     if (Q_UNLIKELY(i == -1))
         return;
@@ -88,13 +88,13 @@ jobject AndroidSurfaceHolder::surfaceHolder() const
 
 bool AndroidSurfaceHolder::isSurfaceCreated() const
 {
-    QMutexLocker locker(shLock);
+    QMutexLocker locker(shLock());
     return m_surfaceCreated;
 }
 
 void AndroidSurfaceHolder::handleSurfaceCreated(JNIEnv*, jobject, jlong id)
 {
-    QMutexLocker locker(shLock);
+    QMutexLocker locker(shLock());
     const int i = surfaceHolders->indexOf(reinterpret_cast<AndroidSurfaceHolder *>(id));
     if (Q_UNLIKELY(i == -1))
         return;
@@ -105,7 +105,7 @@ void AndroidSurfaceHolder::handleSurfaceCreated(JNIEnv*, jobject, jlong id)
 
 void AndroidSurfaceHolder::handleSurfaceDestroyed(JNIEnv*, jobject, jlong id)
 {
-    QMutexLocker locker(shLock);
+    QMutexLocker locker(shLock());
     const int i = surfaceHolders->indexOf(reinterpret_cast<AndroidSurfaceHolder *>(id));
     if (Q_UNLIKELY(i == -1))
         return;
@@ -154,7 +154,7 @@ AndroidSurfaceView::AndroidSurfaceView()
         connect(m_surfaceHolder, &AndroidSurfaceHolder::surfaceCreated,
                 this, &AndroidSurfaceView::surfaceCreated);
         { // Lock now to avoid a race with handleSurfaceCreated()
-            QMutexLocker locker(shLock);
+            QMutexLocker locker(shLock());
             m_window = QWindow::fromWinId(WId(m_surfaceView.object()));
 
             if (m_pendingVisible != -1)
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index ce5c9fe56..04e27b9c4 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -330,7 +330,7 @@ void DirectShowPlayerService::load(const QMediaContent &media, QIODevice *stream
     updateStatus();
 }
 
-void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker)
+void DirectShowPlayerService::doSetUrlSource(QMutexLocker<QMutex> *locker)
 {
     IBaseFilter *source = nullptr;
 
@@ -406,7 +406,7 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker)
     }
 }
 
-void DirectShowPlayerService::doSetStreamSource(QMutexLocker *locker)
+void DirectShowPlayerService::doSetStreamSource(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
     DirectShowIOSource *source = new DirectShowIOSource(m_loop);
@@ -441,7 +441,7 @@ void DirectShowPlayerService::doSetStreamSource(QMutexLocker *locker)
     }
 }
 
-void DirectShowPlayerService::doRender(QMutexLocker *locker)
+void DirectShowPlayerService::doRender(QMutexLocker<QMutex> *locker)
 {
     m_pendingTasks |= m_executedTasks & (Play | Pause);
 
@@ -582,7 +582,7 @@ void DirectShowPlayerService::doRender(QMutexLocker *locker)
     }
 }
 
-void DirectShowPlayerService::doFinalizeLoad(QMutexLocker *locker)
+void DirectShowPlayerService::doFinalizeLoad(QMutexLocker<QMutex> *locker)
 {
     if (m_graphStatus != Loaded) {
         if (IMediaEvent *event = com_cast<IMediaEvent>(m_graph, IID_IMediaEvent)) {
@@ -648,7 +648,7 @@ void DirectShowPlayerService::releaseGraph()
     }
 }
 
-void DirectShowPlayerService::doReleaseGraph(QMutexLocker *locker)
+void DirectShowPlayerService::doReleaseGraph(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
 
@@ -681,7 +681,7 @@ void DirectShowPlayerService::doReleaseGraph(QMutexLocker *locker)
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
 
-void DirectShowPlayerService::doSetVideoProbe(QMutexLocker *locker)
+void DirectShowPlayerService::doSetVideoProbe(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
 
@@ -715,7 +715,7 @@ void DirectShowPlayerService::doSetVideoProbe(QMutexLocker *locker)
     m_videoSampleGrabber->start(DirectShowSampleGrabber::CallbackMethod::BufferCB);
 }
 
-void DirectShowPlayerService::doSetAudioProbe(QMutexLocker *locker)
+void DirectShowPlayerService::doSetAudioProbe(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
 
@@ -755,7 +755,7 @@ void DirectShowPlayerService::doSetAudioProbe(QMutexLocker *locker)
 
 QT_WARNING_POP
 
-void DirectShowPlayerService::doReleaseVideoProbe(QMutexLocker *locker)
+void DirectShowPlayerService::doReleaseVideoProbe(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
 
@@ -776,7 +776,7 @@ void DirectShowPlayerService::doReleaseVideoProbe(QMutexLocker *locker)
     m_videoSampleGrabber = nullptr;
 }
 
-void DirectShowPlayerService::doReleaseAudioProbe(QMutexLocker *locker)
+void DirectShowPlayerService::doReleaseAudioProbe(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
 
@@ -899,7 +899,7 @@ void DirectShowPlayerService::play()
     updateStatus();
 }
 
-void DirectShowPlayerService::doPlay(QMutexLocker *locker)
+void DirectShowPlayerService::doPlay(QMutexLocker<QMutex> *locker)
 {
     // Invalidate if there is an error while loading.
     if (m_error != QMediaPlayer::NoError) {
@@ -957,7 +957,7 @@ void DirectShowPlayerService::pause()
     updateStatus();
 }
 
-void DirectShowPlayerService::doPause(QMutexLocker *locker)
+void DirectShowPlayerService::doPause(QMutexLocker<QMutex> *locker)
 {
     if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
         locker->unlock();
@@ -1013,7 +1013,7 @@ void DirectShowPlayerService::stop()
     updateStatus();
 }
 
-void DirectShowPlayerService::doStop(QMutexLocker *locker)
+void DirectShowPlayerService::doStop(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
     if (m_executedTasks & (Play | Pause)) {
@@ -1049,7 +1049,7 @@ void DirectShowPlayerService::setRate(qreal rate)
         ::SetEvent(m_taskHandle);
 }
 
-void DirectShowPlayerService::doSetRate(QMutexLocker *locker)
+void DirectShowPlayerService::doSetRate(QMutexLocker<QMutex> *locker)
 {
     if (IMediaSeeking *seeking = com_cast<IMediaSeeking>(m_graph, IID_IMediaSeeking)) {
         // Cache current values as we can't query IMediaSeeking during a seek due to the
@@ -1139,7 +1139,7 @@ void DirectShowPlayerService::seek(qint64 position)
         ::SetEvent(m_taskHandle);
 }
 
-void DirectShowPlayerService::doSeek(QMutexLocker *locker)
+void DirectShowPlayerService::doSeek(QMutexLocker<QMutex> *locker)
 {
     if (m_seekPosition == -1)
         return;
@@ -1245,7 +1245,7 @@ void DirectShowPlayerService::setAudioOutput(IBaseFilter *filter)
     m_playerControl->updateAudioOutput(m_audioOutput);
 }
 
-void DirectShowPlayerService::doReleaseAudioOutput(QMutexLocker *locker)
+void DirectShowPlayerService::doReleaseAudioOutput(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
     m_pendingTasks |= m_executedTasks & (Play | Pause);
@@ -1353,7 +1353,7 @@ void DirectShowPlayerService::updateVideoProbe()
     }
 }
 
-void DirectShowPlayerService::doReleaseVideoOutput(QMutexLocker *locker)
+void DirectShowPlayerService::doReleaseVideoOutput(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
     m_pendingTasks |= m_executedTasks & (Play | Pause);
@@ -1551,7 +1551,7 @@ void DirectShowPlayerService::onVideoBufferAvailable(double time, const QByteArr
 
 QT_WARNING_POP
 
-void DirectShowPlayerService::graphEvent(QMutexLocker *locker)
+void DirectShowPlayerService::graphEvent(QMutexLocker<QMutex> *locker)
 {
     Q_UNUSED(locker);
     if (IMediaEvent *event = com_cast<IMediaEvent>(m_graph, IID_IMediaEvent)) {
diff --git a/src/plugins/directshow/player/directshowplayerservice.h b/src/plugins/directshow/player/directshowplayerservice.h
index e0b011f4a..9631a2a70 100644
--- a/src/plugins/directshow/player/directshowplayerservice.h
+++ b/src/plugins/directshow/player/directshowplayerservice.h
@@ -123,24 +123,24 @@ private:
 
     void run();
 
-    void doSetUrlSource(QMutexLocker *locker);
-    void doSetStreamSource(QMutexLocker *locker);
-    void doRender(QMutexLocker *locker);
-    void doFinalizeLoad(QMutexLocker *locker);
-    void doSetRate(QMutexLocker *locker);
-    void doSeek(QMutexLocker *locker);
-    void doPlay(QMutexLocker *locker);
-    void doPause(QMutexLocker *locker);
-    void doStop(QMutexLocker *locker);
-    void doReleaseAudioOutput(QMutexLocker *locker);
-    void doReleaseVideoOutput(QMutexLocker *locker);
-    void doReleaseGraph(QMutexLocker *locker);
-    void doSetVideoProbe(QMutexLocker *locker);
-    void doSetAudioProbe(QMutexLocker *locker);
-    void doReleaseVideoProbe(QMutexLocker *locker);
-    void doReleaseAudioProbe(QMutexLocker *locker);
-
-    void graphEvent(QMutexLocker *locker);
+    void doSetUrlSource(QMutexLocker<QMutex> *locker);
+    void doSetStreamSource(QMutexLocker<QMutex> *locker);
+    void doRender(QMutexLocker<QMutex> *locker);
+    void doFinalizeLoad(QMutexLocker<QMutex> *locker);
+    void doSetRate(QMutexLocker<QMutex> *locker);
+    void doSeek(QMutexLocker<QMutex> *locker);
+    void doPlay(QMutexLocker<QMutex> *locker);
+    void doPause(QMutexLocker<QMutex> *locker);
+    void doStop(QMutexLocker<QMutex> *locker);
+    void doReleaseAudioOutput(QMutexLocker<QMutex> *locker);
+    void doReleaseVideoOutput(QMutexLocker<QMutex> *locker);
+    void doReleaseGraph(QMutexLocker<QMutex> *locker);
+    void doSetVideoProbe(QMutexLocker<QMutex> *locker);
+    void doSetAudioProbe(QMutexLocker<QMutex> *locker);
+    void doReleaseVideoProbe(QMutexLocker<QMutex> *locker);
+    void doReleaseAudioProbe(QMutexLocker<QMutex> *locker);
+
+    void graphEvent(QMutexLocker<QMutex> *locker);
 
     enum Task
     {