diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:01:38 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:01:38 +0100 |
| commit | f4e2f8f71660a914bbbe2495b922ae83c5c5ad67 (patch) | |
| tree | 8cf6dc061c56849362e5e1c400db11e02cbeb231 /src/plugins/android/src | |
| parent | 8517f09af1536502011618d2b0c37537d1eb12ee (diff) | |
| parent | 2d54cb4f460f2665da64e551927e6dbf153c68c1 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I0bc0e3caceaca0def467237983d9c611c46c5d7a
Diffstat (limited to 'src/plugins/android/src')
| -rw-r--r-- | src/plugins/android/src/qandroidmediaserviceplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp index f441baf0a..a66b85f98 100644 --- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp +++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp @@ -166,7 +166,7 @@ Q_DECL_EXPORT jint JNICALL 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 *jniEnv = uenv.nativeEnvironment; @@ -180,5 +180,5 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) AndroidSurfaceTexture::initJNI(jniEnv); - return JNI_VERSION_1_4; + return JNI_VERSION_1_6; } |