diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:04:17 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:04:17 +0100 |
| commit | 18ff92c2c596387bddeaeb6e66ded8e466862b7b (patch) | |
| tree | 0db04a6ed7178abe21d513b2827470e6241e1f0a | |
| parent | 9ba21cdd3079d9534863f120f8ef5e868ecd053d (diff) | |
| parent | e1bb04aa143e6483118bba52ea95eb0efbc87fc3 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ie5cd3fa58dd22edfbf8e596119d8a99cc0fdaa27
| -rw-r--r-- | src/plugins/android/qandroidwebview.cpp | 4 |
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; } |