summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2023-12-13 12:24:22 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-12-14 04:03:05 +0000
commit11c20834812c277cdfd95b87346b1115067c0328 (patch)
tree0c4b38e867b989517121f9120ba97d7b95e37de9 /src
parentf368a64787ff466113ac3897395aaa5a15a88dc2 (diff)
Doc: Fix example file quoting and missing namespace documentation
Fixes the following documentation warnings: declarative-camera.qdoc:54: (qdoc) warning: Command '\printto' failed at end of file declarative-camera.qdoc:152: (qdoc) warning: Command '\printuntil' failed at end of file qvideo.cpp:8: (qdoc) warning: RotationAngle is documented, but namespace QVideo is not documented in any module. Mark the documentation project free of warnings. Pick-to: 6.6 Change-Id: I45153fa9f6ba29a9d636229ef0a0465916f0291f Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> (cherry picked from commit e11d73132d481d0033b2b39124d61fd2163f8959) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/multimedia/doc/qtmultimedia.qdocconf5
-rw-r--r--src/multimedia/video/qvideo.cpp7
2 files changed, 8 insertions, 4 deletions
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf
index 836014f95..02f5e0503 100644
--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/src/multimedia/doc/qtmultimedia.qdocconf
@@ -80,7 +80,4 @@ manifestmeta.highlighted.names = \
manifestmeta.highlighted.names += "QtMultimedia/QML Camera Application"
# Fail the documentation build if there are more warnings than the limit
-
-warninglimit += 2
-# examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc:4: (qdoc) warning: Missing image: qml-declarative-portrait.png
-# examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc:4: (qdoc) warning: Missing image: FlashControls.png
+warninglimit += 0
diff --git a/src/multimedia/video/qvideo.cpp b/src/multimedia/video/qvideo.cpp
index 13f524334..9d5af1d8f 100644
--- a/src/multimedia/video/qvideo.cpp
+++ b/src/multimedia/video/qvideo.cpp
@@ -6,6 +6,13 @@
QT_BEGIN_NAMESPACE
/*!
+ \namespace QVideo
+ \since 6.7
+ \inmodule QtMultimedia
+ \brief Enumerations for camera and video functionality.
+*/
+
+/*!
\enum QVideo::RotationAngle
\since 6.7