diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-10-04 13:32:13 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-04 14:15:11 +0000 |
| commit | a946f377607edb39b5cba8f8c8210b4753ef454b (patch) | |
| tree | 1b205c5b430a431ab21f24877e10724e64cb3173 | |
| parent | 2eebbe74617509f83e9edfc1b126cc515d5f5f03 (diff) | |
| download | qtmultimedia-a946f377607edb39b5cba8f8c8210b4753ef454b.tar.gz | |
Fix emission of error signals in QGstreamerImageCapture
The signal is called "error" in the platform class. That's
inconsistent and should be fixed, but for now adjust to the
existing name.
Change-Id: I04923cc8de1c8ba04bb3f2064d8068a0737b95c4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 0916d9f96b10c3dad5d9840c6050e861bf22d887)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp index 38d6d8f51..0de4e5791 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp @@ -115,7 +115,7 @@ int QGstreamerImageCapture::doCapture(const QString &fileName) if (!m_session) { //emit error in the next event loop, //so application can associate it with returned request id. - QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, + QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, Q_ARG(int, -1), Q_ARG(int, QImageCapture::ResourceError), Q_ARG(QString, QPlatformImageCapture::msgImageCaptureNotSet())); @@ -126,7 +126,7 @@ int QGstreamerImageCapture::doCapture(const QString &fileName) if (!m_session->camera()) { //emit error in the next event loop, //so application can associate it with returned request id. - QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, + QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, Q_ARG(int, -1), Q_ARG(int, QImageCapture::ResourceError), Q_ARG(QString,tr("No camera available."))); @@ -137,7 +137,7 @@ int QGstreamerImageCapture::doCapture(const QString &fileName) if (passImage) { //emit error in the next event loop, //so application can associate it with returned request id. - QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, + QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, Q_ARG(int, -1), Q_ARG(int, QImageCapture::NotReadyError), Q_ARG(QString, QPlatformImageCapture::msgCameraNotReady())); |