diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:01:06 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:01:06 +0100 |
| commit | dda4be3c313af3621906d071712a7cbfb0e2a969 (patch) | |
| tree | 84dfdce4f3f1708f38e855069039442a1476d738 | |
| parent | c682f4cebf2b2f5b9154fabb6b0d9cc4204ff400 (diff) | |
| parent | 6e48b90385570b573a8f5c9ccfc9e12e5cd81d49 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Icfab788cc2671f4fd678c77e1ece51c284d358fb
| -rw-r--r-- | src/androidextras/android/qjnionload.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/androidextras/android/qjnionload.cpp b/src/androidextras/android/qjnionload.cpp index 8f74744..1733428 100644 --- a/src/androidextras/android/qjnionload.cpp +++ b/src/androidextras/android/qjnionload.cpp @@ -89,7 +89,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*reserved*/) UnionJNIEnvToVoid uenv; uenv.venv = nullptr; - if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_4) != JNI_OK) { + if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_6) != JNI_OK) { __android_log_print(ANDROID_LOG_FATAL, "Qt", "GetEnv failed"); return -1; } |