diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:03:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:03:35 +0100 |
| commit | f49b6ce3e8e355c50cd1b42d78de7a8fb714d56c (patch) | |
| tree | dcb8f7cc37eb70191c1014c9bea04c528e3d32b1 | |
| parent | 3794dc3294bad8f3c54e9ca4183e4090b842c0b3 (diff) | |
| parent | be53414956ddcdf3174793d8cf64327d5c6e13d7 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I0d6054198c51622ce0e9c5816e9cc31a6678a62d
| -rw-r--r-- | src/bluetooth/android/jni_android.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/android/jni_android.cpp b/src/bluetooth/android/jni_android.cpp index 0688c869..1ebab74b 100644 --- a/src/bluetooth/android/jni_android.cpp +++ b/src/bluetooth/android/jni_android.cpp @@ -318,7 +318,7 @@ Q_BLUETOOTH_EXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*reserved*/) UnionJNIEnvToVoid uenv; uenv.venv = 0; - 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, logTag, "GetEnv failed"); return -1; } @@ -332,5 +332,5 @@ Q_BLUETOOTH_EXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*reserved*/) if (QT_BT_ANDROID().isDebugEnabled()) __android_log_print(ANDROID_LOG_INFO, logTag, "Bluetooth start"); - return JNI_VERSION_1_4; + return JNI_VERSION_1_6; } |