diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-10 13:18:43 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-11 16:03:43 +0200 |
| commit | 3348107c038cbac724e33d6bb30671ddddc1505a (patch) | |
| tree | 7c2c41ee8dcec7a8f1d431dee5b8a242244ecf00 /src/plugins/platforms/android | |
| parent | f0f00dbd119e0169bc81aa761e4d548e4ecf2214 (diff) | |
Android: take JavaVM() from QJniEnvironment and not QtAndroidPrivate
Task-number: QTBUG-89482
Pick-to: 6.1
Change-Id: Idfd442afc90c00e672b28b43c78c789813f46c7d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/androidjnimain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |