summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-02-17 10:05:19 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-02-18 11:12:04 +0100
commit868242b6e1840fcea491ad86d8b2a7a101c4eeaa (patch)
treeb4538149f36d2a7b655791608ba43b548df6182c /src
parent530b62934923070b5b8b5c5b3c764a2b7d4db039 (diff)
Fix some qdoc-warnings for 6.1
Fix: qtbase/src/testlib/qtestelementattribute.cpp:89: (qdoc) warning: Undocumented enum item 'LET_Message' in QTest::LogElementType qtbase/src/testlib/qtestelementattribute.cpp:89: (qdoc) warning: No such enum item 'LET_Error' in QTest::LogElementType qtbase/src/testlib/qtestelementattribute.cpp:89: (qdoc) warning: Undocumented enum item 'LET_SystemOutput' in QTest::LogElementType qtbase/src/network/ssl/qsslsocket.cpp:1666: (qdoc) warning: Unknown command '\cl' qtbase/src/corelib/kernel/qproperty.cpp:883: (qdoc) warning: Unknown command '\T' qtbase/src/corelib/kernel/qproperty.cpp:799: (qdoc) warning: Undocumented return value (hint: use 'return' or 'returns' in the text qtbase/src/corelib/kernel/qjnienvironment.cpp:250: (qdoc) warning: Undocumented return value (hint: use 'return' or 'returns' in the text Pick-to: 6.1 Change-Id: I116f5d8ace2c29ba7b6b93256d5761591e01296a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qjnienvironment.cpp4
-rw-r--r--src/corelib/kernel/qproperty.cpp4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/kernel/qjnienvironment.cpp b/src/corelib/kernel/qjnienvironment.cpp
index ee57504327..ddadc2e114 100644
--- a/src/corelib/kernel/qjnienvironment.cpp
+++ b/src/corelib/kernel/qjnienvironment.cpp
@@ -257,6 +257,8 @@ bool QJniEnvironment::registerNativeMethods(const char *className, JNINativeMeth
make JNI calls directly via \c JNIEnv, you need to clear any potential
exceptions after the call using this function. For more information about
\c JNIEnv calls that can throw an exception, see \l {Oracle: JNI Functions}{JNI Functions}.
+
+ \return \c true when a pending exception was cleared.
*/
bool QJniEnvironment::exceptionCheckAndClear(QJniEnvironment::OutputMode outputMode)
{
@@ -282,6 +284,8 @@ bool QJniEnvironment::exceptionCheckAndClear(QJniEnvironment::OutputMode outputM
make JNI calls directly via \c JNIEnv, you need to clear any potential
exceptions after the call using this function. For more information about
\c JNIEnv calls that can throw an exception, see \l {Oracle: JNI Functions}{JNI Functions}.
+
+ \return \c true when a pending exception was cleared.
*/
bool QJniEnvironment::exceptionCheckAndClear(JNIEnv *env, QJniEnvironment::OutputMode outputMode)
{
diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp
index bd13642e50..8742ff2af8 100644
--- a/src/corelib/kernel/qproperty.cpp
+++ b/src/corelib/kernel/qproperty.cpp
@@ -803,6 +803,8 @@ QString QPropertyBindingError::description() const
if the QUntypedBindable is read-only, null or if \a binding's type does match the
underlying property's type.
+ \return \c true when the binding was successfully set.
+
\sa QUntypedPropertyBinding::valueMetaType()
*/
@@ -880,7 +882,7 @@ QString QPropertyBindingError::description() const
\fn template <typename T> T QBindable<T>::value() const
Returns the underlying property's current value. If the QBindable is invalid,
- a default constructed \T is returned.
+ a default constructed \c T is returned.
\sa isValid()
*/