diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index fa7a342b8e1..7d15bab2f1a 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -45,7 +45,6 @@ using namespace Qt::StringLiterals; QT_BEGIN_NAMESPACE -static JavaVM *m_javaVM = nullptr; static jclass m_applicationClass = nullptr; static AAssetManager *m_assetManager = nullptr; static jobject m_assets = nullptr; @@ -164,11 +163,6 @@ namespace QtAndroid return m_density; } - JavaVM *javaVM() - { - return m_javaVM; - } - AAssetManager *assetManager() { return m_assetManager; @@ -860,7 +854,7 @@ static bool registerNatives(QJniEnvironment &env) QT_END_NAMESPACE -Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/) +Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM */*vm*/, void */*reserved*/) { static bool initialized = false; if (initialized) @@ -868,10 +862,8 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/) initialized = true; QT_USE_NAMESPACE - m_javaVM = vm; QJniEnvironment env; if (!env.isValid()) { - m_javaVM = nullptr; __android_log_print(ANDROID_LOG_FATAL, "Qt", "Failed to initialize the JNI Environment"); return -1; } diff --git a/src/plugins/platforms/android/androidjnimain.h b/src/plugins/platforms/android/androidjnimain.h index 9d616b18fba..84ee42d834e 100644 --- a/src/plugins/platforms/android/androidjnimain.h +++ b/src/plugins/platforms/android/androidjnimain.h @@ -45,7 +45,6 @@ namespace QtAndroid int availableHeightPixels(); double scaledDensity(); double pixelDensity(); - JavaVM *javaVM(); jobject assets(); AAssetManager *assetManager(); jclass applicationClass(); diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp index 6efd3fc6318..c01c130bcf4 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp @@ -83,7 +83,7 @@ static bool isValidAndroidContextForRendering() void *QAndroidPlatformNativeInterface::nativeResourceForIntegration(const QByteArray &resource) { if (resource=="JavaVM") - return QtAndroid::javaVM(); + return QtAndroidPrivate::javaVM(); if (resource == "QtActivity") { extern Q_CORE_EXPORT jobject qt_androidActivity(); return qt_androidActivity();