diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 03:00:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 03:00:05 +0100 |
| commit | f90be1068d21580be634fb50ce15dc32185ec138 (patch) | |
| tree | a69261d382a412caccfd6b45131120d559cb7086 /src | |
| parent | 6935c61b75ab600950da8ff62b693c426de5b9a5 (diff) | |
| parent | 5885d03a4616d86056d98762bb445867081f2dce (diff) | |
| download | qtlocation-f90be1068d21580be634fb50ce15dc32185ec138.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I81acc98f1602d20d810e5d792fc670bdaa8b1821
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/position/android/src/jnipositioning.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/position/android/src/jnipositioning.cpp b/src/plugins/position/android/src/jnipositioning.cpp index 0f358b42..4812e307 100644 --- a/src/plugins/position/android/src/jnipositioning.cpp +++ b/src/plugins/position/android/src/jnipositioning.cpp @@ -618,7 +618,7 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) uenv.venv = nullptr; javaVM = 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, logTag, "GetEnv failed"); return -1; } @@ -629,6 +629,6 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) } javaVM = vm; - return JNI_VERSION_1_4; + return JNI_VERSION_1_6; } |