From d1694476271346d13ac8ca3138328d295bf403b4 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 4 Feb 2025 15:37:19 +0200 Subject: [PATCH] Android: fix Q_JNI_NATIVE_METHOD() with namespace builds Prepend the Qt namespace to the JNI method under Q_JNI_NATIVE_METHOD. Pick-to: 6.9 6.8 Fixes: QTBUG-132490 Change-Id: I73bb8119a0d760e8f7ce82e70ced2684bec76eb0 Reviewed-by: Volker Hilsheimer --- src/corelib/kernel/qjnitypes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qjnitypes.h b/src/corelib/kernel/qjnitypes.h index 29108b23f9b..1fe073cc3f1 100644 --- a/src/corelib/kernel/qjnitypes.h +++ b/src/corelib/kernel/qjnitypes.h @@ -194,13 +194,13 @@ Q_DECLARE_JNI_NATIVE_METHOD_HELPER(Method, Helper, Name) QT_DECLARE_JNI_NATIVE_METHOD_2(Method, Method) \ #define Q_JNI_NATIVE_METHOD(Method) \ - QtJniMethods::Method##_Helper::makeJNIMethod(::Method) + QtJniMethods::Method##_Helper::makeJNIMethod(QT_PREPEND_NAMESPACE(Method)) #define Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(...) \ QT_OVERLOADED_MACRO(QT_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE, __VA_ARGS__) \ #define QT_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE_2(Method, Name) \ -Q_DECLARE_JNI_NATIVE_METHOD_HELPER(Method, QtJniMethod, Name) \ + Q_DECLARE_JNI_NATIVE_METHOD_HELPER(Method, QtJniMethod, Name) \ #define QT_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE_1(Method) \ QT_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE_2(Method, Method) \