From 271eed5a516af0bea2bade80a1f95006170a6354 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Tue, 1 Jun 2021 11:38:06 +0200 Subject: Doc: Ensure deprecated APIs in Qt Core are documented as such Added \deprecated [version_since] when needed Remove references to deprecated functions in \sa statements Fixes: QTBUG-94534 Change-Id: I3b3d4277d63fc5d6d207c28ff2484aed30b83247 Reviewed-by: Edward Welbourne (cherry picked from commit a2c8184b6b241b063e9af005edf082e653dfd8a6) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qjnienvironment.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/corelib/kernel/qjnienvironment.cpp') diff --git a/src/corelib/kernel/qjnienvironment.cpp b/src/corelib/kernel/qjnienvironment.cpp index 8982d6712f..a72078d2cf 100644 --- a/src/corelib/kernel/qjnienvironment.cpp +++ b/src/corelib/kernel/qjnienvironment.cpp @@ -323,8 +323,6 @@ JavaVM *QJniEnvironment::javaVM() } /*! - \fn bool QJniEnvironment::registerNativeMethods(const char *className, const JNINativeMethod methods[], int size) - Registers the Java methods in the array \a methods of size \a size, each of which can call native C++ functions from class \a className. These methods must be registered before any attempt to call them. @@ -355,10 +353,10 @@ bool QJniEnvironment::registerNativeMethods(const char *className, const JNINati return false; return registerNativeMethods(classObject.objectClass(), methods, size); } - +#if QT_DEPRECATED_SINCE(6, 2) /*! \overload - \obsolete Use the overload with a const JNINativeMethod[] instead. + \deprecated [6.2] Use the overload with a const JNINativeMethod[] instead. Registers the Java methods in the array \a methods of size \a size, each of which can call native C++ functions from class \a className. These methods @@ -380,7 +378,6 @@ bool QJniEnvironment::registerNativeMethods(const char *className, const JNINati env.registerNativeMethods("org/qtproject/android/TestJavaClass", methods, 2); \endcode */ -#if QT_DEPRECATED_SINCE(6, 2) bool QJniEnvironment::registerNativeMethods(const char *className, JNINativeMethod methods[], int size) { -- cgit v1.2.3