Add compile-time generation of JNI class names

As with method signatures, register class names using template function
specialization in the QtJniTypes namespace, and then declare C++ types
as JNI classes with a class name string. Such classes implicitly get
registered as JNI types as well.

Add a QJniObject construct method (since C++ constructors that are
templates cannot be explicitly instantiated with a type), and a
QJniEnvironment::findClass overload.

Add test coverage, also for the recently added macros for native
methods.

As a drive-by, change the name of the Q_JNI_DECLARE_NATIVE_METHOD
macro to Q_DECLARE_JNI_NATIVE_METHOD for consistency.

Change-Id: Ic19562d78da726f202b3bdf4e9354e8ad24d8bd9
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/corelib/kernel/qjnienvironment/tst_qjnienvironment.cpp b/tests/auto/corelib/kernel/qjnienvironment/tst_qjnienvironment.cpp
index f699d6816a..76cad4ddc0 100644
--- a/tests/auto/corelib/kernel/qjnienvironment/tst_qjnienvironment.cpp
+++ b/tests/auto/corelib/kernel/qjnienvironment/tst_qjnienvironment.cpp
@@ -65,6 +65,7 @@ void tst_QJniEnvironment::jniEnv()
         // try to find an existing class with QJniEnvironment
         QJniEnvironment env;
         QVERIFY(env.findClass("java/lang/Object"));
+        QVERIFY(env.findClass<jstring>());
 
         // try to find a nonexistent class
         QVERIFY(!env.findClass("this/doesnt/Exist"));
@@ -98,14 +99,14 @@ static void callbackFromJava(JNIEnv *env, jobject /*thiz*/, jstring value)
     Q_UNUSED(env)
     registerNativesString = QJniObject(value).toString();
 }
-Q_JNI_DECLARE_NATIVE_METHOD(callbackFromJava);
+Q_DECLARE_JNI_NATIVE_METHOD(callbackFromJava);
 
 static void callbackFromJavaNoCtor(JNIEnv *env, jobject /*thiz*/, jstring value)
 {
     Q_UNUSED(env)
     registerNativesString = QJniObject(value).toString();
 }
-Q_JNI_DECLARE_NATIVE_METHOD(callbackFromJavaNoCtor);
+Q_DECLARE_JNI_NATIVE_METHOD(callbackFromJavaNoCtor);
 
 void tst_QJniEnvironment::registerNativeMethods()
 {
@@ -145,7 +146,7 @@ static void intCallbackFromJava(JNIEnv *env, jobject /*thiz*/, jint value)
     Q_UNUSED(env)
     registerNativeInteger = static_cast<int>(value);
 }
-Q_JNI_DECLARE_NATIVE_METHOD(intCallbackFromJava);
+Q_DECLARE_JNI_NATIVE_METHOD(intCallbackFromJava);
 
 void tst_QJniEnvironment::registerNativeMethodsByJclass()
 {