summaryrefslogtreecommitdiffstats
path: root/src/gsttools
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-28 14:10:28 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-29 13:41:44 +0100
commit9f77002fd3106ca4477159212781264d5b688ddb (patch)
tree767a8cbe4ab1e66ca4c7ca9d9e5f8f727c47e281 /src/gsttools
parentc6e934601a3405f80c601aac207b09588e291b89 (diff)
Update dependencies
Fix some warnings about deprecated API and usage pf QMutexLocker. Change-Id: I16a1e66a57d0c638f88478ec250e92178c6a433c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/gsttools')
-rw-r--r--src/gsttools/qgstvideorenderersink.cpp4
-rw-r--r--src/gsttools/qgstvideorenderersink_p.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp
index 4000f2178..8f4f59358 100644
--- a/src/gsttools/qgstvideorenderersink.cpp
+++ b/src/gsttools/qgstvideorenderersink.cpp
@@ -441,7 +441,7 @@ bool QVideoSurfaceGstDelegate::event(QEvent *event)
}
}
-bool QVideoSurfaceGstDelegate::handleEvent(QMutexLocker *locker)
+bool QVideoSurfaceGstDelegate::handleEvent(QMutexLocker<QMutex> *locker)
{
if (m_flush) {
m_flush = false;
@@ -525,7 +525,7 @@ void QVideoSurfaceGstDelegate::notify()
}
bool QVideoSurfaceGstDelegate::waitForAsyncEvent(
- QMutexLocker *locker, QWaitCondition *condition, unsigned long time)
+ QMutexLocker<QMutex> *locker, QWaitCondition *condition, unsigned long time)
{
if (QThread::currentThread() == thread()) {
while (handleEvent(locker)) {}
diff --git a/src/gsttools/qgstvideorenderersink_p.h b/src/gsttools/qgstvideorenderersink_p.h
index 84162814c..81bcb5c02 100644
--- a/src/gsttools/qgstvideorenderersink_p.h
+++ b/src/gsttools/qgstvideorenderersink_p.h
@@ -122,12 +122,12 @@ public:
bool query(GstQuery *query);
private slots:
- bool handleEvent(QMutexLocker *locker);
+ bool handleEvent(QMutexLocker<QMutex> *locker);
void updateSupportedFormats();
private:
void notify();
- bool waitForAsyncEvent(QMutexLocker *locker, QWaitCondition *condition, unsigned long time);
+ bool waitForAsyncEvent(QMutexLocker<QMutex> *locker, QWaitCondition *condition, unsigned long time);
QPointer<QAbstractVideoSurface> m_surface;