summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2019-08-23 08:42:37 +0200
committerPaul Wicking <paul.wicking@qt.io>2019-08-23 08:42:37 +0200
commit0b77a2d9852d3aa8c8c21a68be8a1d6805197155 (patch)
tree43273133aaf87a04eafca6556cf28d17225b3423
parentcdaaae4723518d7b29d8aa9f55e9cbfbae786b8e (diff)
parenta409efbc5530ad1e8becb018e1ad3319b931b2f3 (diff)
Merge 5.12 into 5.12.5v5.12.55.12.5
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
index 46b9e4616..5b0c0d234 100644
--- a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
@@ -146,7 +146,7 @@ QVariant CameraBinV4LImageProcessing::parameter(
qt_safe_close(fd);
if (!ret) {
- qWarning() << "Unable to get the parameter value:" << qt_error_string(errno);
+ qWarning() << "Unable to get the parameter value:" << parameter << ":" << qt_error_string(errno);
return QVariant();
}
@@ -229,7 +229,7 @@ void CameraBinV4LImageProcessing::setParameter(
}
if (::ioctl(fd, VIDIOC_S_CTRL, &control) != 0)
- qWarning() << "Unable to set the parameter value:" << qt_error_string(errno);
+ qWarning() << "Unable to set the parameter value:" << parameter << ":" << qt_error_string(errno);
qt_safe_close(fd);
}
@@ -266,7 +266,8 @@ void CameraBinV4LImageProcessing::updateParametersInfo(
queryControl.id = supportedParametersEntries[i].cid;
if (::ioctl(fd, VIDIOC_QUERYCTRL, &queryControl) != 0) {
- qWarning() << "Unable to query the parameter info:" << qt_error_string(errno);
+ qWarning() << "Unable to query the parameter info:" << supportedParametersEntries[i].parameter
+ << ":" << qt_error_string(errno);
continue;
}