diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-10 12:02:53 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-10 18:58:13 +0000 |
| commit | 048140b2bba993cbc1f53df718ba7569c27a00e8 (patch) | |
| tree | 07080a73d6cdd89642e9e6b0f6999df79de6a103 | |
| parent | d0384a0d68f4a728d2b4249b9d91ffb9c66759cf (diff) | |
QVideoFrameFormat: properly guard the definition of deprecated methods
This commit amends 05b505645ec41106174bab5dfa5a8a7dcca4553c and
44b1526cf98c23b0c8d5c82e48dad479944d7b00
Task-number: QTBUG-105513
Change-Id: Ic1c217235b85e13f78d75e6fcb5bbb8d9968a8ab
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit c2765f62f99b21c1bcba2e9a098048e8d037bfd2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/video/qvideoframeformat.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/multimedia/video/qvideoframeformat.cpp b/src/multimedia/video/qvideoframeformat.cpp index c1f17940e..bc8fbe2e1 100644 --- a/src/multimedia/video/qvideoframeformat.cpp +++ b/src/multimedia/video/qvideoframeformat.cpp @@ -549,6 +549,7 @@ void QVideoFrameFormat::setFrameRate(qreal rate) d->frameRate = rate; } +#if QT_DEPRECATED_SINCE(6, 4) /*! \deprecated Use colorSpace() instead @@ -570,6 +571,7 @@ void QVideoFrameFormat::setYCbCrColorSpace(QVideoFrameFormat::YCbCrColorSpace sp detach(); d->colorSpace = ColorSpace(space); } +#endif // QT_DEPRECATED_SINCE(6, 4) /*! Returns the color space of a video stream. |