diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-10 13:18:43 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-11 19:16:29 +0000 |
| commit | afd74eb7fb2b2cd3d534cc2fdea31085fb9bb3f5 (patch) | |
| tree | 2e457347e6bfa9155bdc74a691c0656df9ef6901 | |
| parent | f576e22f6eb52e1eb6a76c19a1d6d0030d64281e (diff) | |
Android: take JavaVM() from QJniEnvironment and not QtAndroidPrivate
Task-number: QTBUG-89482
Change-Id: Idfd442afc90c00e672b28b43c78c789813f46c7d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 3348107c038cbac724e33d6bb30671ddddc1505a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/plugin/qlibrary_unix.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/android/androidjnimain.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index 95aeee8732..0be3d43e3d 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -53,7 +53,8 @@ #endif #ifdef Q_OS_ANDROID -# include <private/qjnihelpers_p.h> +#include <private/qjnihelpers_p.h> +#include <QtCore/qjnienvironment.h> #endif QT_BEGIN_NAMESPACE @@ -244,7 +245,7 @@ bool QLibraryPrivate::load_sys() if (hnd) { using JniOnLoadPtr = jint (*)(JavaVM *vm, void *reserved); JniOnLoadPtr jniOnLoad = reinterpret_cast<JniOnLoadPtr>(dlsym(hnd, "JNI_OnLoad")); - if (jniOnLoad && jniOnLoad(QtAndroidPrivate::javaVM(), nullptr) == JNI_ERR) { + if (jniOnLoad && jniOnLoad(QJniEnvironment::javaVM(), nullptr) == JNI_ERR) { dlclose(hnd); hnd = nullptr; } 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); } |