diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-04-06 14:39:48 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-04-06 14:42:07 +0000 |
commit | 3769db3e753bcb4bb8cd76d71a1ab148cb3fccbb (patch) | |
tree | d7e9df411076e1889023b579872096db9bf35170 | |
parent | 3c4be415b55e0ea67eb17b30cc50f9f3e64a775d (diff) |
Fix compilation errors
- unused arguments
- comparison always true
- functions with undefined return values
- missing includes
Change-Id: I6caa92de2c08ed597c42290dba1f22ec709ea6ca
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
7 files changed, 20 insertions, 2 deletions
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraexposure.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraexposure.cpp index dbbf990fd..70c25f518 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraexposure.cpp +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraexposure.cpp @@ -71,6 +71,8 @@ bool QGstreamerCameraExposure::isParameterSupported(ExposureParameter parameter) break; } } +#else + Q_UNUSED(parameter); #endif return false; } @@ -101,6 +103,9 @@ QVariantList QGstreamerCameraExposure::supportedParameterRange(ExposureParameter break; } } +#else + Q_UNUSED(parameter); + Q_UNUSED(continuous); #endif return res; @@ -186,6 +191,8 @@ QVariant QGstreamerCameraExposure::actualValue(ExposureParameter parameter) cons break; } } +#else + Q_UNUSED(parameter); #endif return QVariant(); } @@ -291,6 +298,9 @@ bool QGstreamerCameraExposure::setValue(ExposureParameter parameter, const QVari return true; } +#else + Q_UNUSED(parameter); + Q_UNUSED(value); #endif return false; diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimageprocessing.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimageprocessing.cpp index 22f9bf12d..67317218d 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimageprocessing.cpp +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimageprocessing.cpp @@ -246,6 +246,8 @@ bool QGstreamerImageProcessing::setColorFilter(QCameraImageProcessing::ColorFilt return true; } } +#else + Q_UNUSED(filter); #endif return false; } @@ -295,7 +297,7 @@ bool QGstreamerImageProcessing::isParameterValueSupported(QPlatformCameraImagePr case ContrastAdjustment: case BrightnessAdjustment: case SaturationAdjustment: - if (qAbs(value.toReal() > 1)) + if (qAbs(value.toReal()) > 1) return false; return isParameterSupported(parameter); case ColorTemperature: { diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp index 466507a4e..746091231 100644 --- a/src/multimedia/qmediametadata.cpp +++ b/src/multimedia/qmediametadata.cpp @@ -281,8 +281,9 @@ QString QMediaMetaData::stringValue(QMediaMetaData::Key k) const } case ThumbnailImage: case CoverArtImage: - return QString(); + break; } + return QString(); } QString QMediaMetaData::metaDataKeyToString(QMediaMetaData::Key k) @@ -345,6 +346,7 @@ QString QMediaMetaData::metaDataKeyToString(QMediaMetaData::Key k) case QMediaMetaData::LeadPerformer: return (QObject::tr("Lead performer")); } + return QString(); } diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index 316366d53..375f19930 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -990,6 +990,7 @@ QDebug operator<<(QDebug dbg, QVideoFrame::HandleType type) case QVideoFrame::RhiTextureHandle: return dbg << "RhiTextureHandle"; } + return dbg; } QDebug operator<<(QDebug dbg, const QVideoFrame& f) diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp index ad83aa954..b29da03e7 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/video/qvideosurfaceformat.cpp @@ -295,6 +295,7 @@ int QVideoSurfaceFormat::nPlanes() const case Format_IMC3: return 3; } + return 0; } /*! diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp index 3d8fd0ffc..b224c9701 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.cpp +++ b/src/multimediawidgets/qgraphicsvideoitem.cpp @@ -41,6 +41,7 @@ #include "qvideosink.h" #include <qobject.h> +#include <qvideoframe.h> #include <qvideosurfaceformat.h> #include <QtCore/qcoreevent.h> diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h index fbe024f43..a5842bb17 100644 --- a/src/multimediawidgets/qvideowidget_p.h +++ b/src/multimediawidgets/qvideowidget_p.h @@ -52,6 +52,7 @@ // #include <qtmultimediawidgetdefs.h> +#include <qvideoframe.h> #include "qvideowidget.h" QT_BEGIN_NAMESPACE |