summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-01-16 10:35:12 +0200
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-01-20 08:15:39 +0000
commite1bb04aa143e6483118bba52ea95eb0efbc87fc3 (patch)
tree520b3202fedb59ad8be53431da2c99e4dbf2b42e /src
parent319cecf259ef4fd62e1c4a46c035a7450763df5a (diff)
Android: JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4
Update instance of old code using JNI_VERSION_1_4 to make the code consistent. Change-Id: I7f6d074411b3ab5093e45333279b3bd47492ff61 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/android/qandroidwebview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/qandroidwebview.cpp b/src/plugins/android/qandroidwebview.cpp
index 3d2b98d..91122bd 100644
--- a/src/plugins/android/qandroidwebview.cpp
+++ b/src/plugins/android/qandroidwebview.cpp
@@ -422,7 +422,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
UnionJNIEnvToVoid uenv;
uenv.venv = NULL;
- if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_4) != JNI_OK)
+ if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_6) != JNI_OK)
return JNI_ERR;
JNIEnv *env = uenv.nativeEnvironment;
@@ -446,5 +446,5 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
if (env->RegisterNatives(clazz, methods, nMethods) != JNI_OK)
return JNI_ERR;
- return JNI_VERSION_1_4;
+ return JNI_VERSION_1_6;
}