From 89eda9ab1f5758ad5dde17f50b090fdfffb653a3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 17 Feb 2021 10:05:19 +0100 Subject: [PATCH] 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 Change-Id: I116f5d8ace2c29ba7b6b93256d5761591e01296a Reviewed-by: Assam Boudjelthia Reviewed-by: Paul Wicking Reviewed-by: Nico Vertriest (cherry picked from commit 868242b6e1840fcea491ad86d8b2a7a101c4eeaa) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qjnienvironment.cpp | 4 ++++ src/corelib/kernel/qproperty.cpp | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/corelib/kernel/qjnienvironment.cpp b/src/corelib/kernel/qjnienvironment.cpp index ee575043275..ddadc2e114f 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 52d5ca84e8b..b009699a6d3 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 T QBindable::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() */