aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@qt.io>2021-06-14 07:41:01 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-17 05:46:27 +0000
commit742ea91e4892a7eef01fbd933d8a43fb1386a8a2 (patch)
tree7287516a5b2300d4ba4ccd21318d890176109c51
parent93617864a4b5b92eedcb118fec4817432ac4f4bd (diff)
Doc: Fix QDoc warnings qtdeclarative
Change-Id: Ib53e0bc6e30440a5e2c84a0f37bc6cb0e424b821 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 733bb4366e6a59dcfd7be0b33e1ac885eb76e13c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/jsapi/qjsmanagedvalue.cpp2
-rw-r--r--src/qml/jsapi/qjsprimitivevalue.cpp7
2 files changed, 9 insertions, 0 deletions
diff --git a/src/qml/jsapi/qjsmanagedvalue.cpp b/src/qml/jsapi/qjsmanagedvalue.cpp
index 454dc11fd8..f248e12398 100644
--- a/src/qml/jsapi/qjsmanagedvalue.cpp
+++ b/src/qml/jsapi/qjsmanagedvalue.cpp
@@ -65,6 +65,8 @@ QT_BEGIN_NAMESPACE
* \inmodule QtQml
* \since 6.1
*
+ * \inmodule QtQml
+ *
* \brief QJSManagedValue represents a value on the JavaScript heap belonging to a QJSEngine.
*
* The QJSManagedValue class allows interaction with JavaScript values in most
diff --git a/src/qml/jsapi/qjsprimitivevalue.cpp b/src/qml/jsapi/qjsprimitivevalue.cpp
index 1d93a3f0e1..94316c8e1d 100644
--- a/src/qml/jsapi/qjsprimitivevalue.cpp
+++ b/src/qml/jsapi/qjsprimitivevalue.cpp
@@ -46,6 +46,9 @@ QT_BEGIN_NAMESPACE
/*!
\since 6.1
\class QJSPrimitiveUndefined
+
+ \inmodule QtQml
+
\brief An empty marker type to signify the JavaScript Undefined type and its single value.
\inmodule QtQml
*/
@@ -53,6 +56,9 @@ QT_BEGIN_NAMESPACE
/*!
\since 6.1
\class QJSPrimitiveNull
+
+ \inmodule QtQml
+
\brief An empty marker type to signify the JavaScript null value.
\inmodule QtQml
*/
@@ -187,6 +193,7 @@ QT_BEGIN_NAMESPACE
/*!
\fn QJSPrimitiveValue QJSPrimitiveValue::operator+(const QJSPrimitiveValue &lhs, const QJSPrimitiveValue &rhs)
+
\since 6.1
Perfoms the JavaScript '+' operation on \a lhs and \a rhs, and returns the