diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 03:03:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 03:03:06 +0200 |
| commit | 6f56b6bad91fc5ad1712405f7258a327bbe5cd59 (patch) | |
| tree | 4ea9ebba80170bdeb24d5230a539696181c3af2a /tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp | |
| parent | 7587c6f319c00f4471e70cf913155d30d6026d49 (diff) | |
| parent | 00a19570169d8ac7029ca18117d98610176b2a90 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: If64a48a9d2c9dc9cf847d9839ca904e6073db100
Diffstat (limited to 'tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp')
| -rw-r--r-- | tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp b/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp index f0f8fa6..3aa2033 100644 --- a/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp +++ b/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp @@ -66,9 +66,10 @@ void tst_QAndroidJniEnvironment::jniEnv() env->ExceptionClear(); } - // The environment should automatically be detached when QAndroidJniEnvironment goes out of scope - JNIEnv *jni = 0; - QCOMPARE(javaVM->GetEnv((void**)&jni, JNI_VERSION_1_6), JNI_EDETACHED); + // The env does not detach automatically, even if it goes out of scope. The only way it can + // be detached is if it's done explicitly, or if the thread we attached to gets killed (TLS clean-up). + JNIEnv *jni = nullptr; + QCOMPARE(javaVM->GetEnv((void**)&jni, JNI_VERSION_1_6), JNI_OK); } void tst_QAndroidJniEnvironment::javaVM() |