diff options
author | Topi Reinio <topi.reinio@qt.io> | 2018-04-17 11:55:41 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@qt.io> | 2018-04-19 09:37:51 +0000 |
commit | 700e1aa69744565b5327f6a5b185cffb9c9c149f (patch) | |
tree | f8168c29b6fe0ce34514c5b242e25638c095d653 /src/multimedia/video | |
parent | 6d56f614065e7b006a4958c848e13cabb0a68adb (diff) |
Doc: Fix documentation warnings
Add a custom module header, used only for documentation builds, that
pulls in also the QtMultimediaWidgets module.
Several documentation fixes to clean up warnings from clang.
Task-number: QTBUG-67790
Change-Id: I6c1013798a648250c8555eb92684ec3b33ff7531
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/multimedia/video')
-rw-r--r-- | src/multimedia/video/qabstractvideosurface.h | 4 | ||||
-rw-r--r-- | src/multimedia/video/qvideoprobe.h | 2 | ||||
-rw-r--r-- | src/multimedia/video/qvideosurfaceformat.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/video/qvideosurfaceformat.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h index 391c9e696..c136ba6c1 100644 --- a/src/multimedia/video/qabstractvideosurface.h +++ b/src/multimedia/video/qabstractvideosurface.h @@ -68,7 +68,7 @@ public: ~QAbstractVideoSurface(); virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const = 0; + QAbstractVideoBuffer::HandleType type = QAbstractVideoBuffer::NoHandle) const = 0; virtual bool isFormatSupported(const QVideoSurfaceFormat &format) const; virtual QVideoSurfaceFormat nearestFormat(const QVideoSurfaceFormat &format) const; @@ -89,7 +89,7 @@ Q_SIGNALS: void activeChanged(bool active); void surfaceFormatChanged(const QVideoSurfaceFormat &format); void supportedFormatsChanged(); - void nativeResolutionChanged(const QSize &); + void nativeResolutionChanged(const QSize &resolution); protected: void setError(Error error); diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h index 93ba4d2f5..38f5ca05a 100644 --- a/src/multimedia/video/qvideoprobe.h +++ b/src/multimedia/video/qvideoprobe.h @@ -62,7 +62,7 @@ public: bool isActive() const; Q_SIGNALS: - void videoFrameProbed(const QVideoFrame &videoFrame); + void videoFrameProbed(const QVideoFrame &frame); void flush(); private: diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp index 384ab4e53..7a703c260 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/video/qvideosurfaceformat.cpp @@ -464,7 +464,7 @@ bool QVideoSurfaceFormat::isMirrored() const } /*! - Sets if the surface is mirrored around its vertical axis. + Sets if the surface is \a mirrored around its vertical axis. This is typically needed for video frames coming from a front camera of a mobile device. Default value is false. diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h index 175b199a7..1d1990c77 100644 --- a/src/multimedia/video/qvideosurfaceformat.h +++ b/src/multimedia/video/qvideosurfaceformat.h @@ -71,7 +71,7 @@ public: YCbCr_xvYCC601, YCbCr_xvYCC709, YCbCr_JPEG, -#ifndef qdoc +#ifndef Q_QDOC YCbCr_CustomMatrix #endif }; |