From 3348107c038cbac724e33d6bb30671ddddc1505a Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 10 Feb 2021 13:18:43 +0200 Subject: Android: take JavaVM() from QJniEnvironment and not QtAndroidPrivate Task-number: QTBUG-89482 Pick-to: 6.1 Change-Id: Idfd442afc90c00e672b28b43c78c789813f46c7d Reviewed-by: Alex Blasche --- src/plugins/platforms/android/androidjnimain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/android') diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index bdd7f492ac..df0dcc39a1 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -527,8 +527,8 @@ static jboolean startQtApplication(JNIEnv */*env*/, jclass /*clazz*/) args.version = JNI_VERSION_1_6; args.name = "QtMainThread"; args.group = NULL; - JavaVM *vm = QtAndroidPrivate::javaVM(); - if (vm != 0) + JavaVM *vm = QJniEnvironment::javaVM(); + if (vm) vm->AttachCurrentThread(&env, &args); } -- cgit v1.2.3