diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-18 03:00:37 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-18 03:00:37 +0100 |
| commit | be53414956ddcdf3174793d8cf64327d5c6e13d7 (patch) | |
| tree | 151d99db2ddfdc25a2aada9d48c4d5a38a1a70f3 | |
| parent | d3eb54e30943a69c469732f9184cbbad944fef28 (diff) | |
| parent | 00f7f8514f3415bb68d964af18482f47c0d5c94d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4579c24569c9d30896026703df85cb3eeafa945d
| -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; } |